summaryrefslogtreecommitdiff
path: root/JPratt/src
diff options
context:
space:
mode:
Diffstat (limited to 'JPratt/src')
-rw-r--r--JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java4
-rw-r--r--JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java6
-rw-r--r--JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java8
-rw-r--r--JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java4
-rw-r--r--JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java10
-rw-r--r--JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/PrattParser.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java4
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java2
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java4
33 files changed, 56 insertions, 56 deletions
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java
index 1800043..f816307 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.commands.impls.NonBinaryCommand;
import bjc.pratt.tokens.StringToken;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
class AssignCommand extends NonBinaryCommand<String, String, TestContext> {
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java
index dedf010..143678c 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java
@@ -3,9 +3,9 @@ package bjc.pratt.examples.lang;
import java.util.function.UnaryOperator;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.esodata.Directory;
-import bjc.utils.esodata.Stack;
+import bjc.data.ITree;
+import bjc.esodata.Directory;
+import bjc.esodata.Stack;
final class BlockEnter implements UnaryOperator<TestContext> {
@Override
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java
index e3a3475..8bebb1a 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java
@@ -13,7 +13,7 @@ import static bjc.pratt.commands.impls.NonInitialCommands.postCircumfix;
import static bjc.pratt.commands.impls.NonInitialCommands.postfix;
import static bjc.pratt.commands.impls.NonInitialCommands.ternary;
import static bjc.pratt.tokens.StringToken.litToken;
-import static bjc.utils.functypes.ID.id;
+import static bjc.functypes.ID.id;
import java.util.Arrays;
import java.util.HashSet;
@@ -31,9 +31,9 @@ import bjc.pratt.commands.NonInitialCommand;
import bjc.pratt.tokens.StringToken;
import bjc.pratt.tokens.StringTokenStream;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.TransformIterator;
-import bjc.utils.funcdata.IList;
+import bjc.data.ITree;
+import bjc.data.TransformIterator;
+import bjc.funcdata.IList;
import bjc.utils.parserutils.ParserException;
import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter;
import bjc.utils.parserutils.splitter.ExcludingTokenSplitter;
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java
index e824375..4ee778d 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.StringToken;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
class SwitchCommand implements InitialCommand<String, String, TestContext> {
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java
index 340c83d..7db91e7 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java
@@ -1,11 +1,11 @@
package bjc.pratt.examples.lang;
import bjc.pratt.tokens.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.data.ITree;
+import bjc.esodata.Directory;
+import bjc.esodata.SimpleDirectory;
+import bjc.esodata.SimpleStack;
+import bjc.esodata.Stack;
/**
* Simple context for the parser.
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java
index 4b212b8..6a1e3da 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.tokens.StringToken;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
class VarCommand extends AbstractInitialCommand<String, String, TestContext> {
diff --git a/JPratt/src/main/java/bjc/pratt/PrattParser.java b/JPratt/src/main/java/bjc/pratt/PrattParser.java
index 50e06b6..1834b7d 100644
--- a/JPratt/src/main/java/bjc/pratt/PrattParser.java
+++ b/JPratt/src/main/java/bjc/pratt/PrattParser.java
@@ -11,7 +11,7 @@ import bjc.pratt.commands.impls.DefaultInitialCommand;
import bjc.pratt.commands.impls.DefaultNonInitialCommand;
import bjc.pratt.tokens.Token;
import bjc.pratt.tokens.TokenStream;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.funcutils.NumberUtils;
import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java
index c7710dc..434b47f 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java
@@ -4,8 +4,8 @@ import java.util.Set;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java
index 865053d..707bedd 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java
@@ -6,7 +6,7 @@ import bjc.pratt.ParserContext;
import bjc.pratt.PrattParser;
import bjc.pratt.tokens.Token;
import bjc.pratt.tokens.TokenStream;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.funcutils.Isomorphism;
import bjc.utils.parserutils.ParserException;
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java
index b12b391..d6cfda9 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java
@@ -2,7 +2,7 @@ package bjc.pratt.blocks;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java
index e2344ac..e13c3c0 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java
@@ -4,7 +4,7 @@ import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
/**
* Utility class for creating common implementations of {@link ParseBlock}
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java
index 7185717..fafccf1 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java
@@ -4,8 +4,8 @@ import java.util.function.UnaryOperator;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
index 4148472..6dd925e 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java
@@ -4,7 +4,7 @@ import java.util.function.Predicate;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java
index f0f5bbc..f29e3b7 100644
--- a/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java
+++ b/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java
@@ -4,7 +4,7 @@ import java.util.function.UnaryOperator;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java
index 9d24723..d8fd6b9 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/AbstractInitialCommand.java
@@ -2,7 +2,7 @@ package bjc.pratt.commands;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
index 118447e..9cc4dc1 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
@@ -2,8 +2,8 @@ package bjc.pratt.commands;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java
index d0a210a..4a8a93b 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/InitialCommand.java
@@ -2,7 +2,7 @@ package bjc.pratt.commands;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java
index 35b0825..c73874e 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommand.java
@@ -2,7 +2,7 @@ package bjc.pratt.commands;
import bjc.pratt.ParserContext;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java
index 1135ba0..b462118 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/BlockInitialCommand.java
@@ -4,7 +4,7 @@ import bjc.pratt.ParserContext;
import bjc.pratt.blocks.ParseBlock;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java
index e971586..0397a19 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/ChainCommand.java
@@ -5,8 +5,8 @@ import java.util.Set;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.BinaryPostCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java
index a3a8526..dc1b206 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/ConstantCommand.java
@@ -3,7 +3,7 @@ package bjc.pratt.commands.impls;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java
index bc00887..6f0e4d5 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultInitialCommand.java
@@ -3,7 +3,7 @@ package bjc.pratt.commands.impls;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java
index 542c8cc..77cce6e 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/DefaultNonInitialCommand.java
@@ -3,7 +3,7 @@ package bjc.pratt.commands.impls;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.NonInitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
/**
* Default implementation of a non-initial command.
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
index b01c413..f6a84f6 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
@@ -4,7 +4,7 @@ import bjc.pratt.ParserContext;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java
index 868260c..82f7eaa 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/GroupingCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.blocks.ParseBlock;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java b/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java
index 8967527..ed21b19 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java
@@ -9,7 +9,7 @@ import java.util.function.UnaryOperator;
import bjc.pratt.blocks.ParseBlock;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
/**
* * Contains factory methods for producing common implementations of
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java
index f0f1b55..fd535fa 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/LeafCommand.java
@@ -3,8 +3,8 @@ package bjc.pratt.commands.impls;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java
index c6ccd2d..cd13342 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/PostCircumfixCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.blocks.ParseBlock;
import bjc.pratt.commands.BinaryPostCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java
index 30ad9b4..edea7e7 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/PostfixCommand.java
@@ -3,8 +3,8 @@ package bjc.pratt.commands.impls;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.BinaryPostCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
index 2d4a2e5..0a7c8ff 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.blocks.ParseBlock;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java
index 988869e..f4744a7 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/TernaryCommand.java
@@ -4,8 +4,8 @@ import bjc.pratt.ParserContext;
import bjc.pratt.blocks.ParseBlock;
import bjc.pratt.commands.BinaryPostCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java
index f09658e..69eed45 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/TransformingInitialCommand.java
@@ -6,7 +6,7 @@ import bjc.pratt.ParserContext;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.commands.InitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
import bjc.utils.parserutils.ParserException;
/**
diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java
index 15d246d..652dacd 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/UnaryCommand.java
@@ -3,8 +3,8 @@ package bjc.pratt.commands.impls;
import bjc.pratt.ParserContext;
import bjc.pratt.commands.AbstractInitialCommand;
import bjc.pratt.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
import bjc.utils.parserutils.ParserException;
/**