13 files changed, 15 insertions, 15 deletions
diff --git a/RGens/src/main/java/bjc/rgens/newparser/CaseElement.java b/RGens/src/main/java/bjc/rgens/parser/CaseElement.java
index 5d52726..e9e3a0a 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/CaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/CaseElement.java
@@ -1,6 +1,6 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
-import static bjc.rgens.newparser.CaseElement.ElementType.*;
+import static bjc.rgens.parser.CaseElement.ElementType.*;
 
 /*
  * @TODO 10/11/17 Ben Culkin :CaseElementSplit
diff --git a/RGens/src/main/java/bjc/rgens/newparser/GrammarException.java b/RGens/src/main/java/bjc/rgens/parser/GrammarException.java
index 8e66f90..9eaa0a1 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/GrammarException.java
+++ b/RGens/src/main/java/bjc/rgens/parser/GrammarException.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 /**
  * The exception thrown when something goes wrong while parsing a
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java b/RGens/src/main/java/bjc/rgens/parser/RGrammar.java
index 8c6fd7d..17ca4fe 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammar.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcutils.StringUtils;
 
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarBuilder.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarBuilder.java
index 9b89cdd..096decf 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarBuilder.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarBuilder.java
@@ -1,15 +1,15 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 
+import static bjc.rgens.parser.RuleCase.CaseType.*;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import static bjc.rgens.newparser.RuleCase.CaseType.*;
-
 /**
  * Construct randomized grammars piece by piece.
  *
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarFormatter.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarFormatter.java
index acb2c07..96bdee8 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarFormatter.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarFormatter.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcdata.IList;
 
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java
index cf33967..83b295a 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarParser.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java
index 10b78f2..41974c0 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarTest.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarTest.java
index d5cc98f..4b1f283 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarTest.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarTest.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammars.java b/RGens/src/main/java/bjc/rgens/parser/RGrammars.java
index 3704944..69cca0d 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RGrammars.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammars.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RegexRuleCase.java b/RGens/src/main/java/bjc/rgens/parser/RegexRuleCase.java
index fffa1bd..82417da 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RegexRuleCase.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RegexRuleCase.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcdata.IList;
 
diff --git a/RGens/src/main/java/bjc/rgens/newparser/Rule.java b/RGens/src/main/java/bjc/rgens/parser/Rule.java
index 0717233..7043e0f 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/Rule.java
+++ b/RGens/src/main/java/bjc/rgens/parser/Rule.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
diff --git a/RGens/src/main/java/bjc/rgens/newparser/RuleCase.java b/RGens/src/main/java/bjc/rgens/parser/RuleCase.java
index 217d668..764fa89 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/RuleCase.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RuleCase.java
@@ -1,4 +1,4 @@
-package bjc.rgens.newparser;
+package bjc.rgens.parser;
 
 import bjc.utils.funcdata.IList;
 
diff --git a/RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt b/RGens/src/main/java/bjc/rgens/parser/new-syntax.txt
index f6578b4..f6578b4 100644
--- a/RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt
+++ b/RGens/src/main/java/bjc/rgens/parser/new-syntax.txt