Reorganize

43 files changed, 175 insertions, 166 deletions

diff --git a/JPratt/pom.xml b/JPratt/pom.xml
index a1ef7a9..24eb3bb 100644
--- a/JPratt/pom.xml
+++ b/JPratt/pom.xml
@@ -1,28 +1,39 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>bjc</groupId>
-  <artifactId>JPratt</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>JPratt</name>
-  <description>Pratt parser in java</description>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  	<dependency>
-  		<groupId>bjc</groupId>
-  		<artifactId>BJC-Utils2</artifactId>
-  		<version>0.1.0-SNAPSHOT</version>
-  	</dependency>
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>bjc</groupId>
+	<artifactId>JPratt</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>JPratt</name>
+	<description>Pratt parser in java</description>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.2.1</version>
+				<configuration>
+					<mainClass>bjc.pratt.examples.PrattParserTest</mainClass>
+					<arguments>
+					</arguments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>bjc</groupId>
+			<artifactId>BJC-Utils2</artifactId>
+			<version>0.1.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/AssignCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/AssignCommand.java
index 4bdd60f..eb99350 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/AssignCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/AssignCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.pratt.commands.NonBinaryCommand;
+import bjc.pratt.tokens.StringToken;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.commands.NonBinaryCommand;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
 
 class AssignCommand extends NonBinaryCommand<String, String, TestContext> {
 	public AssignCommand(int prec) {
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockEnter.java b/JPratt/src/examples/java/bjc/pratt/examples/BlockEnter.java
index ac04720..71d4e72 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockEnter.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/BlockEnter.java
@@ -1,8 +1,8 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.esodata.Directory;
-import bjc.utils.parserutils.pratt.Token;
 
 import java.util.function.UnaryOperator;
 
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockExit.java b/JPratt/src/examples/java/bjc/pratt/examples/BlockExit.java
index b067464..1cca6d5 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockExit.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/BlockExit.java
@@ -1,4 +1,4 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
 import java.util.function.UnaryOperator;
 
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/PrattParserTest.java b/JPratt/src/examples/java/bjc/pratt/examples/PrattParserTest.java
index 2cc53b0..4a9ae56 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/PrattParserTest.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/PrattParserTest.java
@@ -1,14 +1,14 @@
-package bjc.utils.examples.parsing;
-
+package bjc.pratt.examples;
+
+import bjc.pratt.InitialCommand;
+import bjc.pratt.NonInitialCommand;
+import bjc.pratt.PrattParser;
+import bjc.pratt.Token;
+import bjc.pratt.tokens.StringToken;
+import bjc.pratt.tokens.StringTokenStream;
 import bjc.utils.data.ITree;
 import bjc.utils.data.TransformIterator;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-import bjc.utils.parserutils.pratt.PrattParser;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
-import bjc.utils.parserutils.pratt.tokens.StringTokenStream;
 import bjc.utils.parserutils.splitter.TokenSplitter;
 import bjc.utils.parserutils.splitter.TwoLevelSplitter;
 
@@ -22,11 +22,9 @@ import java.util.Scanner;
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
-import static bjc.utils.parserutils.pratt.commands.NonInitialCommands.*;
-import static bjc.utils.parserutils.pratt.commands.InitialCommands.*;
-
-import static bjc.utils.parserutils.pratt.tokens.StringToken.litToken;
-
+import static bjc.pratt.commands.InitialCommands.*;
+import static bjc.pratt.commands.NonInitialCommands.*;
+import static bjc.pratt.tokens.StringToken.litToken;
 import static bjc.utils.functypes.ID.id;
 
 /**
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/SwitchCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/SwitchCommand.java
index 78d8093..4a5bd22 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/SwitchCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/SwitchCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.pratt.tokens.StringToken;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
 
 class SwitchCommand implements InitialCommand<String, String, TestContext> {
 	@Override
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/TestContext.java b/JPratt/src/examples/java/bjc/pratt/examples/TestContext.java
index 7f9986e..b5e8448 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/TestContext.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/TestContext.java
@@ -1,11 +1,11 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.esodata.Directory;
 import bjc.utils.esodata.SimpleDirectory;
 import bjc.utils.esodata.SimpleStack;
 import bjc.utils.esodata.Stack;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Simple context for the parser.
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/Tokenizer.java b/JPratt/src/examples/java/bjc/pratt/examples/Tokenizer.java
index a224de6..563b578 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/Tokenizer.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/Tokenizer.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
+import bjc.pratt.Token;
+import bjc.pratt.tokens.StringToken;
 
 import java.util.Set;
 import java.util.function.Function;
 
-import static bjc.utils.parserutils.pratt.tokens.StringToken.litToken;
+import static bjc.pratt.tokens.StringToken.litToken;
 
 final class Tokenizer implements Function<String, Token<String, String>> {
 	private Set<String>	ops;
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/VarCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/VarCommand.java
index 5cf4b25..dd04a59 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/VarCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/VarCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.pratt.commands.AbstractInitialCommand;
+import bjc.pratt.tokens.StringToken;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.commands.AbstractInitialCommand;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
 
 class VarCommand extends AbstractInitialCommand<String, String, TestContext> {
 
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/InitialCommand.java b/JPratt/src/main/java/bjc/pratt/InitialCommand.java
index 716b99e..470ef3b 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/InitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/InitialCommand.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/NonInitialCommand.java b/JPratt/src/main/java/bjc/pratt/NonInitialCommand.java
index b6797d3..3f6512d 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/NonInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/NonInitialCommand.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/ParseBlock.java b/JPratt/src/main/java/bjc/pratt/ParseBlock.java
index 4542107..cf707ed 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/ParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/ParseBlock.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/ParserContext.java b/JPratt/src/main/java/bjc/pratt/ParserContext.java
index 55b5e98..f5e22ba 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/ParserContext.java
+++ b/JPratt/src/main/java/bjc/pratt/ParserContext.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
 /**
  * Represents the contextual state passed to a command.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/PrattParser.java b/JPratt/src/main/java/bjc/pratt/PrattParser.java
index c53b4e1..e08a67c 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/PrattParser.java
+++ b/JPratt/src/main/java/bjc/pratt/PrattParser.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
+import bjc.pratt.commands.DefaultInitialCommand;
+import bjc.pratt.commands.DefaultNonInitialCommand;
 import bjc.utils.data.ITree;
 import bjc.utils.funcutils.NumberUtils;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.commands.DefaultNonInitialCommand;
-import bjc.utils.parserutils.pratt.commands.DefaultInitialCommand;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/Token.java b/JPratt/src/main/java/bjc/pratt/Token.java
index 6db8b63..1f2616b 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/Token.java
+++ b/JPratt/src/main/java/bjc/pratt/Token.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
 /**
  * Represents a simple parsing token.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/TokenStream.java b/JPratt/src/main/java/bjc/pratt/TokenStream.java
index 227e9a1..d3472a0 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/TokenStream.java
+++ b/JPratt/src/main/java/bjc/pratt/TokenStream.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt;
+package bjc.pratt;
 
 import bjc.utils.funcutils.StringUtils;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/ParseBlocks.java b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java
index 9df8355..e0dea48 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/ParseBlocks.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.blocks;
+package bjc.pratt.blocks;
 
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Utility class for creating common implementations of {@link ParseBlock}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/RepeatingParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java
index 08a4bae..1c82b36 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/RepeatingParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java
@@ -1,13 +1,13 @@
-package bjc.utils.parserutils.pratt.blocks;
+package bjc.pratt.blocks;
 
 import java.util.function.UnaryOperator;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A parse block that can parse a sequnce of zero or more occurances of another
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/SimpleParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
index c2e9e54..acddd3b 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/SimpleParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
@@ -1,12 +1,12 @@
-package bjc.utils.parserutils.pratt.blocks;
+package bjc.pratt.blocks;
 
 import java.util.function.Predicate;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Simple implementation of {@link ParseBlock}
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/TriggeredParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java
index fbfc61b..5e561fc 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/blocks/TriggeredParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java
@@ -1,12 +1,12 @@
-package bjc.utils.parserutils.pratt.blocks;
+package bjc.pratt.blocks;
 
 import java.util.function.UnaryOperator;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A parse block that can adjust the state before handling its context.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/AbstractInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java
index 3c3a89b..b5a789c 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/AbstractInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Abstract base for initial commands.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
index 781309c..44cb5f8 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A binary operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryPostCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BinaryPostCommand.java
index 806f2f3..18a5584 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/BinaryPostCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/BinaryPostCommand.java
@@ -1,6 +1,6 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
-import bjc.utils.parserutils.pratt.NonInitialCommand;
+import bjc.pratt.NonInitialCommand;
 
 /**
  * A operator with fixed precedence.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ChainCommand.java b/JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java
index 1324586..c7a10b1 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ChainCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/ChainCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 import java.util.Set;
 
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ConstantCommand.java b/JPratt/src/main/java/bjc/pratt/commands/ConstantCommand.java
index 10ff184..86a172f 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/ConstantCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/ConstantCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A command that represents a specific tree.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/DefaultInitialCommand.java
index 7409755..717444a 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/DefaultInitialCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Default implementation of an initial command.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultNonInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/DefaultNonInitialCommand.java
index 887dd25..aeb337d 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DefaultNonInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/DefaultNonInitialCommand.java
@@ -1,9 +1,9 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.NonInitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Default implementation of a non-initial command.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DenestingCommand.java b/JPratt/src/main/java/bjc/pratt/commands/DenestingCommand.java
index 567e608..9b4518f 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/DenestingCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/DenestingCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A command that denests a input tree.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java b/JPratt/src/main/java/bjc/pratt/commands/GroupingCommand.java
index 37cc6ee..1a8d3c8 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/GroupingCommand.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A grouping operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/InitialCommands.java b/JPratt/src/main/java/bjc/pratt/commands/InitialCommands.java
index eac357a..3ece14c 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/InitialCommands.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/InitialCommands.java
@@ -1,13 +1,13 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParseBlock;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.Token;
 
 import java.util.function.UnaryOperator;
 
-import static bjc.utils.parserutils.pratt.blocks.ParseBlocks.*;
+import static bjc.pratt.blocks.ParseBlocks.*;
 
 /**
  * * Contains factory methods for producing common implementations of
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeafCommand.java b/JPratt/src/main/java/bjc/pratt/commands/LeafCommand.java
index 3937f5f..798b9ce 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeafCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/LeafCommand.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A operator that stands for itself.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeftBinaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/LeftBinaryCommand.java
index 58d7261..4a481d7 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/LeftBinaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/LeftBinaryCommand.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
 /**
  * A left-associative operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonBinaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/NonBinaryCommand.java
index d32a1a7..d1208bd 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonBinaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/NonBinaryCommand.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
 /**
  * A non-associative operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonInitialCommands.java b/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommands.java
index 45bdc51..b7eda95 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/NonInitialCommands.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommands.java
@@ -1,9 +1,9 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.blocks.SimpleParseBlock;
+import bjc.pratt.NonInitialCommand;
+import bjc.pratt.ParseBlock;
+import bjc.pratt.Token;
+import bjc.pratt.blocks.SimpleParseBlock;
 
 import java.util.Set;
 
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostCircumfixCommand.java b/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
index 90fca00..6bed0ff 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostCircumfixCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/PostCircumfixCommand.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A post-circumfix operator, like array indexing.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostfixCommand.java b/JPratt/src/main/java/bjc/pratt/commands/PostfixCommand.java
index bab3de4..5e2ce28 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PostfixCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/PostfixCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A postfix operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PreTernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/PreTernaryCommand.java
index 42d1a6e..efa7872 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/PreTernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/PreTernaryCommand.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A prefix ternary operator, like an if/then/else group.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/RightBinaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/RightBinaryCommand.java
index 5f3d9f2..8ddab06 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/RightBinaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/RightBinaryCommand.java
@@ -1,4 +1,4 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
 /**
  * A right-associative binary operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java
index 8f04368..bac12cd 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/TernaryCommand.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParseBlock;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A ternary command, like C's ?:
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TransformingInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/TransformingInitialCommand.java
index 88803df..9ec3631 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/TransformingInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/TransformingInitialCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
 import java.util.function.UnaryOperator;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * An initial command that transforms the result of another command.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/UnaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/UnaryCommand.java
index c608362..0689210 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/commands/UnaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/UnaryCommand.java
@@ -1,10 +1,10 @@
-package bjc.utils.parserutils.pratt.commands;
+package bjc.pratt.commands;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * A unary operator.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
index f156f02..2e75702 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java
+++ b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
@@ -1,6 +1,6 @@
-package bjc.utils.parserutils.pratt.tokens;
+package bjc.pratt.tokens;
 
-import bjc.utils.parserutils.pratt.Token;
+import bjc.pratt.Token;
 
 /**
  * Simple token implementation for strings.
diff --git a/JPratt/src/main/java/bjc/utils/parserutils/pratt/tokens/StringTokenStream.java b/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
index 75e86c4..7f8215a 100644
--- a/JPratt/src/main/java/bjc/utils/parserutils/pratt/tokens/StringTokenStream.java
+++ b/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
@@ -1,11 +1,11 @@
-package bjc.utils.parserutils.pratt.tokens;
+package bjc.pratt.tokens;
 
-import java.util.Iterator;
+import bjc.pratt.Token;
+import bjc.pratt.TokenStream;
 
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.TokenStream;
+import java.util.Iterator;
 
-import static bjc.utils.parserutils.pratt.tokens.StringToken.litToken;
+import static bjc.pratt.tokens.StringToken.litToken;
 
 /**
  * Simple implementation of token stream for strings.