Package reorganization

7 files changed, 23 insertions, 23 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 5053f67..8b96850 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java
@@ -1,9 +1,9 @@
 package bjc.pratt.examples.lang;
 
 import bjc.pratt.ParserContext;
-import bjc.pratt.Token;
-import bjc.pratt.commands.NonBinaryCommand;
+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.utils.parserutils.ParserException;
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 41e0303..dedf010 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java
@@ -2,7 +2,7 @@ package bjc.pratt.examples.lang;
 
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.Token;
+import bjc.pratt.tokens.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.esodata.Directory;
 import bjc.utils.esodata.Stack;
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 3686a84..7af16a0 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java
@@ -1,17 +1,17 @@
 package bjc.pratt.examples.lang;
 
-import static bjc.pratt.commands.InitialCommands.delimited;
-import static bjc.pratt.commands.InitialCommands.grouping;
-import static bjc.pratt.commands.InitialCommands.leaf;
-import static bjc.pratt.commands.InitialCommands.preTernary;
-import static bjc.pratt.commands.InitialCommands.unary;
-import static bjc.pratt.commands.NonInitialCommands.chain;
-import static bjc.pratt.commands.NonInitialCommands.infixLeft;
-import static bjc.pratt.commands.NonInitialCommands.infixNon;
-import static bjc.pratt.commands.NonInitialCommands.infixRight;
-import static bjc.pratt.commands.NonInitialCommands.postCircumfix;
-import static bjc.pratt.commands.NonInitialCommands.postfix;
-import static bjc.pratt.commands.NonInitialCommands.ternary;
+import static bjc.pratt.commands.impls.InitialCommands.delimited;
+import static bjc.pratt.commands.impls.InitialCommands.grouping;
+import static bjc.pratt.commands.impls.InitialCommands.leaf;
+import static bjc.pratt.commands.impls.InitialCommands.preTernary;
+import static bjc.pratt.commands.impls.InitialCommands.unary;
+import static bjc.pratt.commands.impls.NonInitialCommands.chain;
+import static bjc.pratt.commands.impls.NonInitialCommands.infixLeft;
+import static bjc.pratt.commands.impls.NonInitialCommands.infixNon;
+import static bjc.pratt.commands.impls.NonInitialCommands.infixRight;
+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;
 
@@ -25,12 +25,12 @@ import java.util.Scanner;
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
-import bjc.pratt.InitialCommand;
-import bjc.pratt.NonInitialCommand;
 import bjc.pratt.PrattParser;
-import bjc.pratt.Token;
+import bjc.pratt.commands.InitialCommand;
+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;
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 f5fc9b1..e824375 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java
@@ -1,9 +1,9 @@
 package bjc.pratt.examples.lang;
 
-import bjc.pratt.InitialCommand;
 import bjc.pratt.ParserContext;
-import bjc.pratt.Token;
+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.utils.parserutils.ParserException;
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 659ba36..340c83d 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java
@@ -1,6 +1,6 @@
 package bjc.pratt.examples.lang;
 
-import bjc.pratt.Token;
+import bjc.pratt.tokens.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.esodata.Directory;
 import bjc.utils.esodata.SimpleDirectory;
diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/Tokenizer.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/Tokenizer.java
index 800a4ec..7a84d93 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/Tokenizer.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/Tokenizer.java
@@ -5,8 +5,8 @@ import static bjc.pratt.tokens.StringToken.litToken;
 import java.util.Set;
 import java.util.function.Function;
 
-import bjc.pratt.Token;
 import bjc.pratt.tokens.StringToken;
+import bjc.pratt.tokens.Token;
 
 final class Tokenizer implements Function<String, Token<String, String>> {
 	private final Set<String>	ops;
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 a2f428b..48fc49c 100644
--- a/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java
@@ -1,9 +1,9 @@
 package bjc.pratt.examples.lang;
 
 import bjc.pratt.ParserContext;
-import bjc.pratt.Token;
 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.utils.parserutils.ParserException;