48 files changed, 228 insertions, 191 deletions
diff --git a/JPratt/src/main/java/bjc/pratt/parsing/package-info.java b/JPratt/src/main/java/bjc/pratt/parsing/package-info.java
deleted file mode 100644
index e7f4fa8..0000000
--- a/JPratt/src/main/java/bjc/pratt/parsing/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package bjc.pratt.parsing;
-\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/ParserContext.java b/JPratt/src/main/java/com/ashardalon/pratt/ParserContext.java
index 76cdf22..cd6fcc2 100644
--- a/JPratt/src/main/java/bjc/pratt/ParserContext.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/ParserContext.java
@@ -1,6 +1,6 @@
-package bjc.pratt;
+package com.ashardalon.pratt;
 
-import bjc.pratt.tokens.TokenStream;
+import com.ashardalon.pratt.tokens.TokenStream;
 
 /**
  * Represents the contextual state passed to a command.
diff --git a/JPratt/src/main/java/bjc/pratt/PrattParser.java b/JPratt/src/main/java/com/ashardalon/pratt/PrattParser.java
index c7d40fc..ea7afd8 100644
--- a/JPratt/src/main/java/bjc/pratt/PrattParser.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/PrattParser.java
@@ -1,4 +1,4 @@
-package bjc.pratt;
+package com.ashardalon.pratt;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,17 +7,18 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.commands.MetaInitialCommand;
-import bjc.pratt.commands.MetaNonInitialCommand;
-import bjc.pratt.commands.NonInitialCommand;
-import bjc.pratt.commands.impls.DefaultInitialCommand;
-import bjc.pratt.commands.impls.DefaultNonInitialCommand;
-import bjc.pratt.tokens.ExpectionNotMet;
-import bjc.pratt.tokens.Token;
-import bjc.pratt.tokens.TokenStream;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.commands.MetaInitialCommand;
+import com.ashardalon.pratt.commands.MetaNonInitialCommand;
+import com.ashardalon.pratt.commands.NonInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.commands.impls.DefaultInitialCommand;
+import com.ashardalon.pratt.commands.impls.DefaultNonInitialCommand;
+import com.ashardalon.pratt.tokens.ExpectionNotMet;
+import com.ashardalon.pratt.tokens.Token;
+import com.ashardalon.pratt.tokens.TokenStream;
+
 import bjc.data.TransformIterator;
 import bjc.data.Tree;
 import bjc.utils.funcutils.NumberUtils;
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/ChainParseBlock.java
index 2717e42..fe04070 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/ChainParseBlock.java
@@ -1,11 +1,12 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
 
 import java.util.Set;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/GrammarParseBlock.java
index 446b80b..048e9f6 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/GrammarParseBlock.java
@@ -1,13 +1,14 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
 
 import java.util.function.Function;
 
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.PrattParser;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.tokens.Token;
+import com.ashardalon.pratt.tokens.TokenStream;
+
 import bjc.data.Tree;
-import bjc.pratt.ParserContext;
-import bjc.pratt.PrattParser;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.tokens.Token;
-import bjc.pratt.tokens.TokenStream;
 import bjc.typeclasses.Isomorphism;
 import bjc.data.Tree;
 import bjc.functypes.*;
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/ParseBlock.java
index aa2fa2e..51aa7fa 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/ParseBlock.java
@@ -1,7 +1,8 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/ParseBlocks.java
index 96b9737..89989fd 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/ParseBlocks.java
@@ -1,9 +1,10 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
 
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/RepeatingParseBlock.java
index 722e395..25827b4 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/RepeatingParseBlock.java
@@ -1,11 +1,12 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
 
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/SimpleParseBlock.java
index b674815..8c4a046 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/SimpleParseBlock.java
@@ -1,11 +1,12 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
 
 import java.util.function.Predicate;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/TriggeredParseBlock.java
index d404eea..1aeabdb 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/TriggeredParseBlock.java
@@ -1,10 +1,11 @@
-package bjc.pratt.blocks;
+package com.ashardalon.pratt.blocks;
 
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/AbstractInitialCommand.java
index 3e4f3a9..c38aa9b 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/AbstractInitialCommand.java
@@ -1,7 +1,8 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.tokens.Token;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/BinaryCommand.java
index 7a65052..739cb44 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/BinaryCommand.java
@@ -1,9 +1,11 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/BinaryPostCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/BinaryPostCommand.java
index 1fa1ba3..bacab23 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/BinaryPostCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/BinaryPostCommand.java
@@ -1,4 +1,4 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
 
 /**
  * A operator with fixed precedence.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/BranchInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/BranchInitialCommand.java
index 3f3093e..0e17287 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/BranchInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/BranchInitialCommand.java
@@ -1,9 +1,10 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
 
 import java.util.Map;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/CommandResult.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/CommandResult.java
index 38a55ae..45c1788 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/CommandResult.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/CommandResult.java
@@ -1,7 +1,8 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
+
+import com.ashardalon.pratt.tokens.Token;
 
 import bjc.data.Tree;
-import bjc.pratt.tokens.Token;
 
 /**
  * Represents the result of executing a command.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/InitialCommand.java
index 0cfa290..3b613a3 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/InitialCommand.java
@@ -1,7 +1,8 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.tokens.Token;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/MetaInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/MetaInitialCommand.java
index d209177..7b9aae0 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/MetaInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/MetaInitialCommand.java
@@ -1,6 +1,6 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
 
-import bjc.pratt.ParserContext;
+import com.ashardalon.pratt.ParserContext;
 
 /**
  * A 'meta-command' that yields the actual command to use.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/MetaNonInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/MetaNonInitialCommand.java
index 956dcec..4aa5120 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/MetaNonInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/MetaNonInitialCommand.java
@@ -1,6 +1,6 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
 
-import bjc.pratt.ParserContext;
+import com.ashardalon.pratt.ParserContext;
 
 /**
  * A 'meta-command' for non-initial commands.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/NonInitialCommand.java
index 02826a9..a521e5c 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/NonInitialCommand.java
@@ -1,7 +1,8 @@
-package bjc.pratt.commands;
+package com.ashardalon.pratt.commands;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/BlockInitialCommand.java
index 07d9a76..612167a 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/BlockInitialCommand.java
@@ -1,10 +1,11 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.commands.AbstractInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.commands.AbstractInitialCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.tokens.Token;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/ChainCommand.java
index 7311eb9..5ba84ef 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/ChainCommand.java
@@ -1,12 +1,13 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
 import java.util.Set;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.BinaryPostCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.BinaryPostCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/ConstantCommand.java
index 657743c..dd80205 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/ConstantCommand.java
@@ -1,9 +1,10 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/DefaultInitialCommand.java
index 8d28b57..1c218c9 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/DefaultInitialCommand.java
@@ -1,9 +1,10 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.tokens.Token;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/DefaultNonInitialCommand.java
index 2ae9fb7..8666713 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/DefaultNonInitialCommand.java
@@ -1,9 +1,10 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.NonInitialCommand;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.NonInitialCommand;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/DenestingCommand.java
index de39e0b..438101e 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/DenestingCommand.java
@@ -1,11 +1,12 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.AbstractInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.AbstractInitialCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.tokens.Token;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/GroupingCommand.java
index 44aa2c1..284c1e9 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/GroupingCommand.java
@@ -1,11 +1,13 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.commands.AbstractInitialCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.commands.AbstractInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/InitialCommands.java
index 6af6954..f4b0bbe 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/InitialCommands.java
@@ -1,14 +1,15 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import static bjc.pratt.blocks.ParseBlocks.repeating;
-import static bjc.pratt.blocks.ParseBlocks.simple;
-import static bjc.pratt.blocks.ParseBlocks.trigger;
+import static com.ashardalon.pratt.blocks.ParseBlocks.repeating;
+import static com.ashardalon.pratt.blocks.ParseBlocks.simple;
+import static com.ashardalon.pratt.blocks.ParseBlocks.trigger;
 
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.commands.*;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.commands.*;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 import bjc.functypes.MapBuilder;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/LeafCommand.java
index 20fb3d4..886a377 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/LeafCommand.java
@@ -1,9 +1,10 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.tokens.Token;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.tokens.Token;
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/LeftBinaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/LeftBinaryCommand.java
index 9a72859..c5408d6 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/LeftBinaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/LeftBinaryCommand.java
@@ -1,6 +1,6 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.commands.BinaryCommand;
+import com.ashardalon.pratt.commands.BinaryCommand;
 
 /**
  * A left-associative operator.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/NonBinaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/NonBinaryCommand.java
index d303663..aca3784 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/NonBinaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/NonBinaryCommand.java
@@ -1,6 +1,6 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.commands.BinaryCommand;
+import com.ashardalon.pratt.commands.BinaryCommand;
 
 /**
  * A non-associative operator.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/NonInitialCommands.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/NonInitialCommands.java
index 6019ffe..41f0bab 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/NonInitialCommands.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/NonInitialCommands.java
@@ -1,11 +1,11 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
 import java.util.Set;
 
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.blocks.SimpleParseBlock;
-import bjc.pratt.commands.NonInitialCommand;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.blocks.SimpleParseBlock;
+import com.ashardalon.pratt.commands.NonInitialCommand;
+import com.ashardalon.pratt.tokens.Token;
 
 /**
  * Contains factory methods for producing common implementations of
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PanfixCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PanfixCommand.java
index 04ad370..99d43c8 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PanfixCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PanfixCommand.java
@@ -1,12 +1,13 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
 
 import bjc.data.SimpleTree;
 import bjc.data.Tree;
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
 import bjc.utils.parserutils.ParserException;
 
 /**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PostCircumfixCommand.java
index ec2c8fb..c5b60a1 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PostCircumfixCommand.java
@@ -1,12 +1,14 @@
-package bjc.pratt.commands.impls;
-
-import bjc.pratt.ParserContext;
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.commands.BinaryPostCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
+package com.ashardalon.pratt.commands.impls;
+
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.commands.BinaryPostCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PostfixCommand.java
index ff370d0..84ac61d 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PostfixCommand.java
@@ -1,10 +1,12 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.BinaryPostCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.BinaryPostCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PreTernaryCommand.java
index 5d5cbe1..cd01333 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/PreTernaryCommand.java
@@ -1,12 +1,14 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.commands.AbstractInitialCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.commands.AbstractInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/RightBinaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/RightBinaryCommand.java
index 4439930..9145fd6 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/RightBinaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/RightBinaryCommand.java
@@ -1,6 +1,6 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.commands.BinaryCommand;
+import com.ashardalon.pratt.commands.BinaryCommand;
 
 /**
  * A right-associative binary operator.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/TernaryCommand.java
index 786dfec..b52107f 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/TernaryCommand.java
@@ -1,12 +1,14 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.blocks.ParseBlock;
-import bjc.pratt.commands.BinaryPostCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.blocks.ParseBlock;
+import com.ashardalon.pratt.commands.BinaryPostCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/TransformingInitialCommand.java
index 36f881d..9a08c44 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/TransformingInitialCommand.java
@@ -1,13 +1,14 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.AbstractInitialCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.commands.InitialCommand;
-import bjc.pratt.tokens.Token;
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.AbstractInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.InitialCommand;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.Tree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/UnaryCommand.java
index 657c004..a7efdc3 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/commands/impls/UnaryCommand.java
@@ -1,11 +1,13 @@
-package bjc.pratt.commands.impls;
+package com.ashardalon.pratt.commands.impls;
 
-import bjc.pratt.ParserContext;
-import bjc.pratt.commands.AbstractInitialCommand;
-import bjc.pratt.commands.CommandResult;
-import bjc.pratt.commands.CommandResult.Status;
-import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.AbstractInitialCommand;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
 import bjc.data.SimpleTree;
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/com/ashardalon/pratt/parsing/package-info.java b/JPratt/src/main/java/com/ashardalon/pratt/parsing/package-info.java
new file mode 100644
index 0000000..7108bc2
--- /dev/null
+++ b/JPratt/src/main/java/com/ashardalon/pratt/parsing/package-info.java
@@ -0,0 +1 @@
+package com.ashardalon.pratt.parsing;
+\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/ExpectionNotMet.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/ExpectionNotMet.java
index 2bd45e2..b700203 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/ExpectionNotMet.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/ExpectionNotMet.java
@@ -1,4 +1,4 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
 import bjc.utils.parserutils.ParserException;
 
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/SimpleToken.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/SimpleToken.java
index 18e2e5a..ee68835 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/SimpleToken.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/SimpleToken.java
@@ -1,4 +1,4 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
 import java.util.Objects;
 
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/SimpleTokenStream.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/SimpleTokenStream.java
index fba38bb..cc751d1 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/SimpleTokenStream.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/SimpleTokenStream.java
@@ -1,4 +1,4 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
 import java.util.Iterator;
 
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/StringToken.java
index 750518a..e9b17dc 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/StringToken.java
@@ -1,4 +1,4 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
 /**
  * Simple token implementation for strings.
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/StringTokenStream.java
index 70876f2..fb25016 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/StringTokenStream.java
@@ -1,6 +1,6 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
-import static bjc.pratt.tokens.StringToken.litToken;
+import static com.ashardalon.pratt.tokens.StringToken.litToken;
 
 import java.util.Iterator;
 
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/Token.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/Token.java
index 7de4ada..86f0d05 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/Token.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/Token.java
@@ -1,4 +1,4 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
 /**
  * Represents a simple parsing token.
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/TokenStream.java b/JPratt/src/main/java/com/ashardalon/pratt/tokens/TokenStream.java
index dc09bcc..3f2681b 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/TokenStream.java
+++ b/JPratt/src/main/java/com/ashardalon/pratt/tokens/TokenStream.java
@@ -1,4 +1,4 @@
-package bjc.pratt.tokens;
+package com.ashardalon.pratt.tokens;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/JPratt/src/main/java/module-info.java b/JPratt/src/main/java/module-info.java
index 87dcbf7..13f29fe 100644
--- a/JPratt/src/main/java/module-info.java
+++ b/JPratt/src/main/java/module-info.java
@@ -1,10 +1,10 @@
 module jpratt {
-	exports bjc.pratt.tokens;
-	exports bjc.pratt.commands;
-	exports bjc.pratt.blocks;
-	exports bjc.pratt.commands.impls;
-	exports bjc.pratt;
-	exports bjc.pratt.parsing;
+	exports com.ashardalon.pratt.tokens;
+	exports com.ashardalon.pratt.commands;
+	exports com.ashardalon.pratt.blocks;
+	exports com.ashardalon.pratt.commands.impls;
+	exports com.ashardalon.pratt;
+	exports com.ashardalon.pratt.parsing;
 	requires esodata;
 	requires bjc.utils;
 	requires junit;