diff --git a/pom.xml b/pom.xml
index e13676f..827788e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,10 @@
1.2.0
- src/main
- src/test
+ src/main/java
+
+ src/test/java
+
@@ -18,14 +20,14 @@
-
-
- src/test
-
- **/*.java
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/main/application/LispMain.java b/src/main/java/application/LispMain.java
similarity index 100%
rename from src/main/application/LispMain.java
rename to src/main/java/application/LispMain.java
diff --git a/src/main/environment/RuntimeEnvironment.java b/src/main/java/environment/RuntimeEnvironment.java
similarity index 100%
rename from src/main/environment/RuntimeEnvironment.java
rename to src/main/java/environment/RuntimeEnvironment.java
diff --git a/src/main/error/CriticalLineColumnException.java b/src/main/java/error/CriticalLineColumnException.java
similarity index 100%
rename from src/main/error/CriticalLineColumnException.java
rename to src/main/java/error/CriticalLineColumnException.java
diff --git a/src/main/error/CriticalLispException.java b/src/main/java/error/CriticalLispException.java
similarity index 100%
rename from src/main/error/CriticalLispException.java
rename to src/main/java/error/CriticalLispException.java
diff --git a/src/main/error/ErrorManager.java b/src/main/java/error/ErrorManager.java
similarity index 100%
rename from src/main/error/ErrorManager.java
rename to src/main/java/error/ErrorManager.java
diff --git a/src/main/error/LineColumnException.java b/src/main/java/error/LineColumnException.java
similarity index 100%
rename from src/main/error/LineColumnException.java
rename to src/main/java/error/LineColumnException.java
diff --git a/src/main/error/LispException.java b/src/main/java/error/LispException.java
similarity index 100%
rename from src/main/error/LispException.java
rename to src/main/java/error/LispException.java
diff --git a/src/main/error/LispWarning.java b/src/main/java/error/LispWarning.java
similarity index 100%
rename from src/main/error/LispWarning.java
rename to src/main/java/error/LispWarning.java
diff --git a/src/main/file/FilePosition.java b/src/main/java/file/FilePosition.java
similarity index 100%
rename from src/main/file/FilePosition.java
rename to src/main/java/file/FilePosition.java
diff --git a/src/main/file/FilePositionTracker.java b/src/main/java/file/FilePositionTracker.java
similarity index 100%
rename from src/main/file/FilePositionTracker.java
rename to src/main/java/file/FilePositionTracker.java
diff --git a/src/main/function/ArgumentValidator.java b/src/main/java/function/ArgumentValidator.java
similarity index 100%
rename from src/main/function/ArgumentValidator.java
rename to src/main/java/function/ArgumentValidator.java
diff --git a/src/main/function/FunctionNames.java b/src/main/java/function/FunctionNames.java
similarity index 100%
rename from src/main/function/FunctionNames.java
rename to src/main/java/function/FunctionNames.java
diff --git a/src/main/function/LispFunction.java b/src/main/java/function/LispFunction.java
similarity index 100%
rename from src/main/function/LispFunction.java
rename to src/main/java/function/LispFunction.java
diff --git a/src/main/function/LispSpecialFunction.java b/src/main/java/function/LispSpecialFunction.java
similarity index 100%
rename from src/main/function/LispSpecialFunction.java
rename to src/main/java/function/LispSpecialFunction.java
diff --git a/src/main/function/UserDefinedFunction.java b/src/main/java/function/UserDefinedFunction.java
similarity index 100%
rename from src/main/function/UserDefinedFunction.java
rename to src/main/java/function/UserDefinedFunction.java
diff --git a/src/main/function/UserDefinedMacro.java b/src/main/java/function/UserDefinedMacro.java
similarity index 100%
rename from src/main/function/UserDefinedMacro.java
rename to src/main/java/function/UserDefinedMacro.java
diff --git a/src/main/function/UserDefinedSpecialFunction.java b/src/main/java/function/UserDefinedSpecialFunction.java
similarity index 100%
rename from src/main/function/UserDefinedSpecialFunction.java
rename to src/main/java/function/UserDefinedSpecialFunction.java
diff --git a/src/main/function/builtin/APPLY.java b/src/main/java/function/builtin/APPLY.java
similarity index 100%
rename from src/main/function/builtin/APPLY.java
rename to src/main/java/function/builtin/APPLY.java
diff --git a/src/main/function/builtin/BackquoteEvaluator.java b/src/main/java/function/builtin/BackquoteEvaluator.java
similarity index 100%
rename from src/main/function/builtin/BackquoteEvaluator.java
rename to src/main/java/function/builtin/BackquoteEvaluator.java
diff --git a/src/main/function/builtin/EVAL.java b/src/main/java/function/builtin/EVAL.java
similarity index 100%
rename from src/main/function/builtin/EVAL.java
rename to src/main/java/function/builtin/EVAL.java
diff --git a/src/main/function/builtin/EXIT.java b/src/main/java/function/builtin/EXIT.java
similarity index 100%
rename from src/main/function/builtin/EXIT.java
rename to src/main/java/function/builtin/EXIT.java
diff --git a/src/main/function/builtin/FUNCALL.java b/src/main/java/function/builtin/FUNCALL.java
similarity index 100%
rename from src/main/function/builtin/FUNCALL.java
rename to src/main/java/function/builtin/FUNCALL.java
diff --git a/src/main/function/builtin/FUSE.java b/src/main/java/function/builtin/FUSE.java
similarity index 100%
rename from src/main/function/builtin/FUSE.java
rename to src/main/java/function/builtin/FUSE.java
diff --git a/src/main/function/builtin/GENSYM.java b/src/main/java/function/builtin/GENSYM.java
similarity index 100%
rename from src/main/function/builtin/GENSYM.java
rename to src/main/java/function/builtin/GENSYM.java
diff --git a/src/main/function/builtin/LOAD.java b/src/main/java/function/builtin/LOAD.java
similarity index 100%
rename from src/main/function/builtin/LOAD.java
rename to src/main/java/function/builtin/LOAD.java
diff --git a/src/main/function/builtin/PRINT.java b/src/main/java/function/builtin/PRINT.java
similarity index 100%
rename from src/main/function/builtin/PRINT.java
rename to src/main/java/function/builtin/PRINT.java
diff --git a/src/main/function/builtin/SET.java b/src/main/java/function/builtin/SET.java
similarity index 100%
rename from src/main/function/builtin/SET.java
rename to src/main/java/function/builtin/SET.java
diff --git a/src/main/function/builtin/SYMBOLS.java b/src/main/java/function/builtin/SYMBOLS.java
similarity index 100%
rename from src/main/function/builtin/SYMBOLS.java
rename to src/main/java/function/builtin/SYMBOLS.java
diff --git a/src/main/function/builtin/SYMBOL_FUNCTION.java b/src/main/java/function/builtin/SYMBOL_FUNCTION.java
similarity index 100%
rename from src/main/function/builtin/SYMBOL_FUNCTION.java
rename to src/main/java/function/builtin/SYMBOL_FUNCTION.java
diff --git a/src/main/function/builtin/cons/APPEND.java b/src/main/java/function/builtin/cons/APPEND.java
similarity index 100%
rename from src/main/function/builtin/cons/APPEND.java
rename to src/main/java/function/builtin/cons/APPEND.java
diff --git a/src/main/function/builtin/cons/CONS.java b/src/main/java/function/builtin/cons/CONS.java
similarity index 100%
rename from src/main/function/builtin/cons/CONS.java
rename to src/main/java/function/builtin/cons/CONS.java
diff --git a/src/main/function/builtin/cons/FIRST.java b/src/main/java/function/builtin/cons/FIRST.java
similarity index 100%
rename from src/main/function/builtin/cons/FIRST.java
rename to src/main/java/function/builtin/cons/FIRST.java
diff --git a/src/main/function/builtin/cons/LENGTH.java b/src/main/java/function/builtin/cons/LENGTH.java
similarity index 100%
rename from src/main/function/builtin/cons/LENGTH.java
rename to src/main/java/function/builtin/cons/LENGTH.java
diff --git a/src/main/function/builtin/cons/LIST.java b/src/main/java/function/builtin/cons/LIST.java
similarity index 100%
rename from src/main/function/builtin/cons/LIST.java
rename to src/main/java/function/builtin/cons/LIST.java
diff --git a/src/main/function/builtin/cons/REST.java b/src/main/java/function/builtin/cons/REST.java
similarity index 100%
rename from src/main/function/builtin/cons/REST.java
rename to src/main/java/function/builtin/cons/REST.java
diff --git a/src/main/function/builtin/math/DIVIDE.java b/src/main/java/function/builtin/math/DIVIDE.java
similarity index 100%
rename from src/main/function/builtin/math/DIVIDE.java
rename to src/main/java/function/builtin/math/DIVIDE.java
diff --git a/src/main/function/builtin/math/MINUS.java b/src/main/java/function/builtin/math/MINUS.java
similarity index 100%
rename from src/main/function/builtin/math/MINUS.java
rename to src/main/java/function/builtin/math/MINUS.java
diff --git a/src/main/function/builtin/math/MODULO.java b/src/main/java/function/builtin/math/MODULO.java
similarity index 100%
rename from src/main/function/builtin/math/MODULO.java
rename to src/main/java/function/builtin/math/MODULO.java
diff --git a/src/main/function/builtin/math/MULTIPLY.java b/src/main/java/function/builtin/math/MULTIPLY.java
similarity index 100%
rename from src/main/function/builtin/math/MULTIPLY.java
rename to src/main/java/function/builtin/math/MULTIPLY.java
diff --git a/src/main/function/builtin/math/MathFunction.java b/src/main/java/function/builtin/math/MathFunction.java
similarity index 100%
rename from src/main/function/builtin/math/MathFunction.java
rename to src/main/java/function/builtin/math/MathFunction.java
diff --git a/src/main/function/builtin/math/PLUS.java b/src/main/java/function/builtin/math/PLUS.java
similarity index 100%
rename from src/main/function/builtin/math/PLUS.java
rename to src/main/java/function/builtin/math/PLUS.java
diff --git a/src/main/function/builtin/math/REMAINDER.java b/src/main/java/function/builtin/math/REMAINDER.java
similarity index 100%
rename from src/main/function/builtin/math/REMAINDER.java
rename to src/main/java/function/builtin/math/REMAINDER.java
diff --git a/src/main/function/builtin/predicate/ATOM.java b/src/main/java/function/builtin/predicate/ATOM.java
similarity index 100%
rename from src/main/function/builtin/predicate/ATOM.java
rename to src/main/java/function/builtin/predicate/ATOM.java
diff --git a/src/main/function/builtin/predicate/EQ.java b/src/main/java/function/builtin/predicate/EQ.java
similarity index 100%
rename from src/main/function/builtin/predicate/EQ.java
rename to src/main/java/function/builtin/predicate/EQ.java
diff --git a/src/main/function/builtin/predicate/EQUAL.java b/src/main/java/function/builtin/predicate/EQUAL.java
similarity index 100%
rename from src/main/function/builtin/predicate/EQUAL.java
rename to src/main/java/function/builtin/predicate/EQUAL.java
diff --git a/src/main/function/builtin/predicate/GENSYM_EQUAL.java b/src/main/java/function/builtin/predicate/GENSYM_EQUAL.java
similarity index 100%
rename from src/main/function/builtin/predicate/GENSYM_EQUAL.java
rename to src/main/java/function/builtin/predicate/GENSYM_EQUAL.java
diff --git a/src/main/function/builtin/predicate/LISTP.java b/src/main/java/function/builtin/predicate/LISTP.java
similarity index 100%
rename from src/main/function/builtin/predicate/LISTP.java
rename to src/main/java/function/builtin/predicate/LISTP.java
diff --git a/src/main/function/builtin/predicate/NULL.java b/src/main/java/function/builtin/predicate/NULL.java
similarity index 100%
rename from src/main/function/builtin/predicate/NULL.java
rename to src/main/java/function/builtin/predicate/NULL.java
diff --git a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java b/src/main/java/function/builtin/predicate/NUMERIC_EQUAL.java
similarity index 100%
rename from src/main/function/builtin/predicate/NUMERIC_EQUAL.java
rename to src/main/java/function/builtin/predicate/NUMERIC_EQUAL.java
diff --git a/src/main/function/builtin/predicate/NUMERIC_GREATER.java b/src/main/java/function/builtin/predicate/NUMERIC_GREATER.java
similarity index 100%
rename from src/main/function/builtin/predicate/NUMERIC_GREATER.java
rename to src/main/java/function/builtin/predicate/NUMERIC_GREATER.java
diff --git a/src/main/function/builtin/predicate/NUMERIC_LESS.java b/src/main/java/function/builtin/predicate/NUMERIC_LESS.java
similarity index 100%
rename from src/main/function/builtin/predicate/NUMERIC_LESS.java
rename to src/main/java/function/builtin/predicate/NUMERIC_LESS.java
diff --git a/src/main/function/builtin/special/AND.java b/src/main/java/function/builtin/special/AND.java
similarity index 100%
rename from src/main/function/builtin/special/AND.java
rename to src/main/java/function/builtin/special/AND.java
diff --git a/src/main/function/builtin/special/CASE.java b/src/main/java/function/builtin/special/CASE.java
similarity index 100%
rename from src/main/function/builtin/special/CASE.java
rename to src/main/java/function/builtin/special/CASE.java
diff --git a/src/main/function/builtin/special/COND.java b/src/main/java/function/builtin/special/COND.java
similarity index 100%
rename from src/main/function/builtin/special/COND.java
rename to src/main/java/function/builtin/special/COND.java
diff --git a/src/main/function/builtin/special/DEFINE_SPECIAL.java b/src/main/java/function/builtin/special/DEFINE_SPECIAL.java
similarity index 100%
rename from src/main/function/builtin/special/DEFINE_SPECIAL.java
rename to src/main/java/function/builtin/special/DEFINE_SPECIAL.java
diff --git a/src/main/function/builtin/special/DEFMACRO.java b/src/main/java/function/builtin/special/DEFMACRO.java
similarity index 100%
rename from src/main/function/builtin/special/DEFMACRO.java
rename to src/main/java/function/builtin/special/DEFMACRO.java
diff --git a/src/main/function/builtin/special/DEFUN.java b/src/main/java/function/builtin/special/DEFUN.java
similarity index 100%
rename from src/main/function/builtin/special/DEFUN.java
rename to src/main/java/function/builtin/special/DEFUN.java
diff --git a/src/main/function/builtin/special/Define.java b/src/main/java/function/builtin/special/Define.java
similarity index 100%
rename from src/main/function/builtin/special/Define.java
rename to src/main/java/function/builtin/special/Define.java
diff --git a/src/main/function/builtin/special/IF.java b/src/main/java/function/builtin/special/IF.java
similarity index 100%
rename from src/main/function/builtin/special/IF.java
rename to src/main/java/function/builtin/special/IF.java
diff --git a/src/main/function/builtin/special/LAMBDA.java b/src/main/java/function/builtin/special/LAMBDA.java
similarity index 100%
rename from src/main/function/builtin/special/LAMBDA.java
rename to src/main/java/function/builtin/special/LAMBDA.java
diff --git a/src/main/function/builtin/special/LET.java b/src/main/java/function/builtin/special/LET.java
similarity index 100%
rename from src/main/function/builtin/special/LET.java
rename to src/main/java/function/builtin/special/LET.java
diff --git a/src/main/function/builtin/special/LET_STAR.java b/src/main/java/function/builtin/special/LET_STAR.java
similarity index 100%
rename from src/main/function/builtin/special/LET_STAR.java
rename to src/main/java/function/builtin/special/LET_STAR.java
diff --git a/src/main/function/builtin/special/OR.java b/src/main/java/function/builtin/special/OR.java
similarity index 100%
rename from src/main/function/builtin/special/OR.java
rename to src/main/java/function/builtin/special/OR.java
diff --git a/src/main/function/builtin/special/PROGN.java b/src/main/java/function/builtin/special/PROGN.java
similarity index 100%
rename from src/main/function/builtin/special/PROGN.java
rename to src/main/java/function/builtin/special/PROGN.java
diff --git a/src/main/function/builtin/special/QUOTE.java b/src/main/java/function/builtin/special/QUOTE.java
similarity index 100%
rename from src/main/function/builtin/special/QUOTE.java
rename to src/main/java/function/builtin/special/QUOTE.java
diff --git a/src/main/function/builtin/special/RECUR.java b/src/main/java/function/builtin/special/RECUR.java
similarity index 100%
rename from src/main/function/builtin/special/RECUR.java
rename to src/main/java/function/builtin/special/RECUR.java
diff --git a/src/main/function/builtin/special/SETQ.java b/src/main/java/function/builtin/special/SETQ.java
similarity index 100%
rename from src/main/function/builtin/special/SETQ.java
rename to src/main/java/function/builtin/special/SETQ.java
diff --git a/src/main/interpreter/FileLispInterpreter.java b/src/main/java/interpreter/FileLispInterpreter.java
similarity index 100%
rename from src/main/interpreter/FileLispInterpreter.java
rename to src/main/java/interpreter/FileLispInterpreter.java
diff --git a/src/main/interpreter/InteractiveLispInterpreter.java b/src/main/java/interpreter/InteractiveLispInterpreter.java
similarity index 100%
rename from src/main/interpreter/InteractiveLispInterpreter.java
rename to src/main/java/interpreter/InteractiveLispInterpreter.java
diff --git a/src/main/interpreter/LispInterpreter.java b/src/main/java/interpreter/LispInterpreter.java
similarity index 100%
rename from src/main/interpreter/LispInterpreter.java
rename to src/main/java/interpreter/LispInterpreter.java
diff --git a/src/main/interpreter/LispInterpreterBuilder.java b/src/main/java/interpreter/LispInterpreterBuilder.java
similarity index 100%
rename from src/main/interpreter/LispInterpreterBuilder.java
rename to src/main/java/interpreter/LispInterpreterBuilder.java
diff --git a/src/main/interpreter/LispInterpreterBuilderImpl.java b/src/main/java/interpreter/LispInterpreterBuilderImpl.java
similarity index 100%
rename from src/main/interpreter/LispInterpreterBuilderImpl.java
rename to src/main/java/interpreter/LispInterpreterBuilderImpl.java
diff --git a/src/main/parser/LispParser.java b/src/main/java/parser/LispParser.java
similarity index 100%
rename from src/main/parser/LispParser.java
rename to src/main/java/parser/LispParser.java
diff --git a/src/main/recursion/TailCall.java b/src/main/java/recursion/TailCall.java
similarity index 100%
rename from src/main/recursion/TailCall.java
rename to src/main/java/recursion/TailCall.java
diff --git a/src/main/recursion/TailCalls.java b/src/main/java/recursion/TailCalls.java
similarity index 100%
rename from src/main/recursion/TailCalls.java
rename to src/main/java/recursion/TailCalls.java
diff --git a/src/main/scanner/LispCommentRemovingInputStream.java b/src/main/java/scanner/LispCommentRemovingInputStream.java
similarity index 100%
rename from src/main/scanner/LispCommentRemovingInputStream.java
rename to src/main/java/scanner/LispCommentRemovingInputStream.java
diff --git a/src/main/scanner/LispInputStream.java b/src/main/java/scanner/LispInputStream.java
similarity index 100%
rename from src/main/scanner/LispInputStream.java
rename to src/main/java/scanner/LispInputStream.java
diff --git a/src/main/scanner/LispScanner.java b/src/main/java/scanner/LispScanner.java
similarity index 100%
rename from src/main/scanner/LispScanner.java
rename to src/main/java/scanner/LispScanner.java
diff --git a/src/main/sexpression/AtSignExpression.java b/src/main/java/sexpression/AtSignExpression.java
similarity index 100%
rename from src/main/sexpression/AtSignExpression.java
rename to src/main/java/sexpression/AtSignExpression.java
diff --git a/src/main/sexpression/Atom.java b/src/main/java/sexpression/Atom.java
similarity index 100%
rename from src/main/sexpression/Atom.java
rename to src/main/java/sexpression/Atom.java
diff --git a/src/main/sexpression/BackquoteExpression.java b/src/main/java/sexpression/BackquoteExpression.java
similarity index 100%
rename from src/main/sexpression/BackquoteExpression.java
rename to src/main/java/sexpression/BackquoteExpression.java
diff --git a/src/main/sexpression/CommaExpression.java b/src/main/java/sexpression/CommaExpression.java
similarity index 100%
rename from src/main/sexpression/CommaExpression.java
rename to src/main/java/sexpression/CommaExpression.java
diff --git a/src/main/sexpression/Cons.java b/src/main/java/sexpression/Cons.java
similarity index 100%
rename from src/main/sexpression/Cons.java
rename to src/main/java/sexpression/Cons.java
diff --git a/src/main/sexpression/DisplayName.java b/src/main/java/sexpression/DisplayName.java
similarity index 100%
rename from src/main/sexpression/DisplayName.java
rename to src/main/java/sexpression/DisplayName.java
diff --git a/src/main/sexpression/LambdaExpression.java b/src/main/java/sexpression/LambdaExpression.java
similarity index 100%
rename from src/main/sexpression/LambdaExpression.java
rename to src/main/java/sexpression/LambdaExpression.java
diff --git a/src/main/sexpression/LispNumber.java b/src/main/java/sexpression/LispNumber.java
similarity index 100%
rename from src/main/sexpression/LispNumber.java
rename to src/main/java/sexpression/LispNumber.java
diff --git a/src/main/sexpression/LispString.java b/src/main/java/sexpression/LispString.java
similarity index 100%
rename from src/main/sexpression/LispString.java
rename to src/main/java/sexpression/LispString.java
diff --git a/src/main/sexpression/Nil.java b/src/main/java/sexpression/Nil.java
similarity index 100%
rename from src/main/sexpression/Nil.java
rename to src/main/java/sexpression/Nil.java
diff --git a/src/main/sexpression/SExpression.java b/src/main/java/sexpression/SExpression.java
similarity index 100%
rename from src/main/sexpression/SExpression.java
rename to src/main/java/sexpression/SExpression.java
diff --git a/src/main/sexpression/Symbol.java b/src/main/java/sexpression/Symbol.java
similarity index 100%
rename from src/main/sexpression/Symbol.java
rename to src/main/java/sexpression/Symbol.java
diff --git a/src/main/stream/SafeInputStream.java b/src/main/java/stream/SafeInputStream.java
similarity index 100%
rename from src/main/stream/SafeInputStream.java
rename to src/main/java/stream/SafeInputStream.java
diff --git a/src/main/stream/SafeOutputStream.java b/src/main/java/stream/SafeOutputStream.java
similarity index 100%
rename from src/main/stream/SafeOutputStream.java
rename to src/main/java/stream/SafeOutputStream.java
diff --git a/src/main/stream/UncheckedIOException.java b/src/main/java/stream/UncheckedIOException.java
similarity index 100%
rename from src/main/stream/UncheckedIOException.java
rename to src/main/java/stream/UncheckedIOException.java
diff --git a/src/main/table/ExecutionContext.java b/src/main/java/table/ExecutionContext.java
similarity index 100%
rename from src/main/table/ExecutionContext.java
rename to src/main/java/table/ExecutionContext.java
diff --git a/src/main/table/FunctionTable.java b/src/main/java/table/FunctionTable.java
similarity index 100%
rename from src/main/table/FunctionTable.java
rename to src/main/java/table/FunctionTable.java
diff --git a/src/main/table/SymbolTable.java b/src/main/java/table/SymbolTable.java
similarity index 100%
rename from src/main/table/SymbolTable.java
rename to src/main/java/table/SymbolTable.java
diff --git a/src/main/terminal/ControlSequence.java b/src/main/java/terminal/ControlSequence.java
similarity index 100%
rename from src/main/terminal/ControlSequence.java
rename to src/main/java/terminal/ControlSequence.java
diff --git a/src/main/terminal/ControlSequenceHandler.java b/src/main/java/terminal/ControlSequenceHandler.java
similarity index 100%
rename from src/main/terminal/ControlSequenceHandler.java
rename to src/main/java/terminal/ControlSequenceHandler.java
diff --git a/src/main/terminal/ControlSequenceLookup.java b/src/main/java/terminal/ControlSequenceLookup.java
similarity index 100%
rename from src/main/terminal/ControlSequenceLookup.java
rename to src/main/java/terminal/ControlSequenceLookup.java
diff --git a/src/main/terminal/LispTerminal.java b/src/main/java/terminal/LispTerminal.java
similarity index 100%
rename from src/main/terminal/LispTerminal.java
rename to src/main/java/terminal/LispTerminal.java
diff --git a/src/main/terminal/SelectGraphicRendition.java b/src/main/java/terminal/SelectGraphicRendition.java
similarity index 100%
rename from src/main/terminal/SelectGraphicRendition.java
rename to src/main/java/terminal/SelectGraphicRendition.java
diff --git a/src/main/terminal/TerminalConfiguration.java b/src/main/java/terminal/TerminalConfiguration.java
similarity index 100%
rename from src/main/terminal/TerminalConfiguration.java
rename to src/main/java/terminal/TerminalConfiguration.java
diff --git a/src/main/terminal/TerminalHistory.java b/src/main/java/terminal/TerminalHistory.java
similarity index 100%
rename from src/main/terminal/TerminalHistory.java
rename to src/main/java/terminal/TerminalHistory.java
diff --git a/src/main/token/AtSign.java b/src/main/java/token/AtSign.java
similarity index 100%
rename from src/main/token/AtSign.java
rename to src/main/java/token/AtSign.java
diff --git a/src/main/token/Backquote.java b/src/main/java/token/Backquote.java
similarity index 100%
rename from src/main/token/Backquote.java
rename to src/main/java/token/Backquote.java
diff --git a/src/main/token/Comma.java b/src/main/java/token/Comma.java
similarity index 100%
rename from src/main/token/Comma.java
rename to src/main/java/token/Comma.java
diff --git a/src/main/token/Eof.java b/src/main/java/token/Eof.java
similarity index 100%
rename from src/main/token/Eof.java
rename to src/main/java/token/Eof.java
diff --git a/src/main/token/Identifier.java b/src/main/java/token/Identifier.java
similarity index 100%
rename from src/main/token/Identifier.java
rename to src/main/java/token/Identifier.java
diff --git a/src/main/token/LeftParenthesis.java b/src/main/java/token/LeftParenthesis.java
similarity index 100%
rename from src/main/token/LeftParenthesis.java
rename to src/main/java/token/LeftParenthesis.java
diff --git a/src/main/token/Number.java b/src/main/java/token/Number.java
similarity index 100%
rename from src/main/token/Number.java
rename to src/main/java/token/Number.java
diff --git a/src/main/token/QuoteMark.java b/src/main/java/token/QuoteMark.java
similarity index 100%
rename from src/main/token/QuoteMark.java
rename to src/main/java/token/QuoteMark.java
diff --git a/src/main/token/QuotedString.java b/src/main/java/token/QuotedString.java
similarity index 100%
rename from src/main/token/QuotedString.java
rename to src/main/java/token/QuotedString.java
diff --git a/src/main/token/RightParenthesis.java b/src/main/java/token/RightParenthesis.java
similarity index 100%
rename from src/main/token/RightParenthesis.java
rename to src/main/java/token/RightParenthesis.java
diff --git a/src/main/token/Token.java b/src/main/java/token/Token.java
similarity index 100%
rename from src/main/token/Token.java
rename to src/main/java/token/Token.java
diff --git a/src/main/token/TokenFactory.java b/src/main/java/token/TokenFactory.java
similarity index 100%
rename from src/main/token/TokenFactory.java
rename to src/main/java/token/TokenFactory.java
diff --git a/src/main/token/TokenFactoryImpl.java b/src/main/java/token/TokenFactoryImpl.java
similarity index 100%
rename from src/main/token/TokenFactoryImpl.java
rename to src/main/java/token/TokenFactoryImpl.java
diff --git a/src/main/util/Characters.java b/src/main/java/util/Characters.java
similarity index 100%
rename from src/main/util/Characters.java
rename to src/main/java/util/Characters.java
diff --git a/src/main/util/Path.java b/src/main/java/util/Path.java
similarity index 100%
rename from src/main/util/Path.java
rename to src/main/java/util/Path.java
diff --git a/src/test/acceptance/AcceptanceTest.java b/src/test/java/acceptance/AcceptanceTest.java
similarity index 100%
rename from src/test/acceptance/AcceptanceTest.java
rename to src/test/java/acceptance/AcceptanceTest.java
diff --git a/src/test/acceptance/fixture/LispInterpreterFixture.java b/src/test/java/acceptance/fixture/LispInterpreterFixture.java
similarity index 100%
rename from src/test/acceptance/fixture/LispInterpreterFixture.java
rename to src/test/java/acceptance/fixture/LispInterpreterFixture.java
diff --git a/src/test/application/MainTest.java b/src/test/java/application/MainTest.java
similarity index 100%
rename from src/test/application/MainTest.java
rename to src/test/java/application/MainTest.java
diff --git a/src/test/application/test-files/file.lisp b/src/test/java/application/test-files/file.lisp
similarity index 100%
rename from src/test/application/test-files/file.lisp
rename to src/test/java/application/test-files/file.lisp
diff --git a/src/test/environment/RuntimeEnvironmentTest.java b/src/test/java/environment/RuntimeEnvironmentTest.java
similarity index 100%
rename from src/test/environment/RuntimeEnvironmentTest.java
rename to src/test/java/environment/RuntimeEnvironmentTest.java
diff --git a/src/test/error/ErrorManagerTest.java b/src/test/java/error/ErrorManagerTest.java
similarity index 100%
rename from src/test/error/ErrorManagerTest.java
rename to src/test/java/error/ErrorManagerTest.java
diff --git a/src/test/file/FilePositionTrackerTest.java b/src/test/java/file/FilePositionTrackerTest.java
similarity index 100%
rename from src/test/file/FilePositionTrackerTest.java
rename to src/test/java/file/FilePositionTrackerTest.java
diff --git a/src/test/function/ArgumentValidatorTest.java b/src/test/java/function/ArgumentValidatorTest.java
similarity index 100%
rename from src/test/function/ArgumentValidatorTest.java
rename to src/test/java/function/ArgumentValidatorTest.java
diff --git a/src/test/function/LispFunctionTest.java b/src/test/java/function/LispFunctionTest.java
similarity index 100%
rename from src/test/function/LispFunctionTest.java
rename to src/test/java/function/LispFunctionTest.java
diff --git a/src/test/function/LispSpecialFunctionTest.java b/src/test/java/function/LispSpecialFunctionTest.java
similarity index 100%
rename from src/test/function/LispSpecialFunctionTest.java
rename to src/test/java/function/LispSpecialFunctionTest.java
diff --git a/src/test/function/UserDefinedFunctionTest.java b/src/test/java/function/UserDefinedFunctionTest.java
similarity index 100%
rename from src/test/function/UserDefinedFunctionTest.java
rename to src/test/java/function/UserDefinedFunctionTest.java
diff --git a/src/test/function/builtin/APPLYTest.java b/src/test/java/function/builtin/APPLYTest.java
similarity index 100%
rename from src/test/function/builtin/APPLYTest.java
rename to src/test/java/function/builtin/APPLYTest.java
diff --git a/src/test/function/builtin/BackquoteEvaluatorTest.java b/src/test/java/function/builtin/BackquoteEvaluatorTest.java
similarity index 100%
rename from src/test/function/builtin/BackquoteEvaluatorTest.java
rename to src/test/java/function/builtin/BackquoteEvaluatorTest.java
diff --git a/src/test/function/builtin/EVALTest.java b/src/test/java/function/builtin/EVALTest.java
similarity index 100%
rename from src/test/function/builtin/EVALTest.java
rename to src/test/java/function/builtin/EVALTest.java
diff --git a/src/test/function/builtin/EXITTest.java b/src/test/java/function/builtin/EXITTest.java
similarity index 100%
rename from src/test/function/builtin/EXITTest.java
rename to src/test/java/function/builtin/EXITTest.java
diff --git a/src/test/function/builtin/FUNCALLTest.java b/src/test/java/function/builtin/FUNCALLTest.java
similarity index 100%
rename from src/test/function/builtin/FUNCALLTest.java
rename to src/test/java/function/builtin/FUNCALLTest.java
diff --git a/src/test/function/builtin/GENSYMTest.java b/src/test/java/function/builtin/GENSYMTest.java
similarity index 100%
rename from src/test/function/builtin/GENSYMTest.java
rename to src/test/java/function/builtin/GENSYMTest.java
diff --git a/src/test/function/builtin/LOADTest.java b/src/test/java/function/builtin/LOADTest.java
similarity index 100%
rename from src/test/function/builtin/LOADTest.java
rename to src/test/java/function/builtin/LOADTest.java
diff --git a/src/test/function/builtin/PRINTTest.java b/src/test/java/function/builtin/PRINTTest.java
similarity index 100%
rename from src/test/function/builtin/PRINTTest.java
rename to src/test/java/function/builtin/PRINTTest.java
diff --git a/src/test/function/builtin/SETTest.java b/src/test/java/function/builtin/SETTest.java
similarity index 100%
rename from src/test/function/builtin/SETTest.java
rename to src/test/java/function/builtin/SETTest.java
diff --git a/src/test/function/builtin/SYMBOLSTest.java b/src/test/java/function/builtin/SYMBOLSTest.java
similarity index 100%
rename from src/test/function/builtin/SYMBOLSTest.java
rename to src/test/java/function/builtin/SYMBOLSTest.java
diff --git a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/java/function/builtin/SYMBOL_FUNCTIONTest.java
similarity index 100%
rename from src/test/function/builtin/SYMBOL_FUNCTIONTest.java
rename to src/test/java/function/builtin/SYMBOL_FUNCTIONTest.java
diff --git a/src/test/function/builtin/cons/APPENDTest.java b/src/test/java/function/builtin/cons/APPENDTest.java
similarity index 100%
rename from src/test/function/builtin/cons/APPENDTest.java
rename to src/test/java/function/builtin/cons/APPENDTest.java
diff --git a/src/test/function/builtin/cons/CONSTest.java b/src/test/java/function/builtin/cons/CONSTest.java
similarity index 100%
rename from src/test/function/builtin/cons/CONSTest.java
rename to src/test/java/function/builtin/cons/CONSTest.java
diff --git a/src/test/function/builtin/cons/FIRSTTest.java b/src/test/java/function/builtin/cons/FIRSTTest.java
similarity index 100%
rename from src/test/function/builtin/cons/FIRSTTest.java
rename to src/test/java/function/builtin/cons/FIRSTTest.java
diff --git a/src/test/function/builtin/cons/LENGTHTest.java b/src/test/java/function/builtin/cons/LENGTHTest.java
similarity index 100%
rename from src/test/function/builtin/cons/LENGTHTest.java
rename to src/test/java/function/builtin/cons/LENGTHTest.java
diff --git a/src/test/function/builtin/cons/LISTTest.java b/src/test/java/function/builtin/cons/LISTTest.java
similarity index 100%
rename from src/test/function/builtin/cons/LISTTest.java
rename to src/test/java/function/builtin/cons/LISTTest.java
diff --git a/src/test/function/builtin/cons/RESTTest.java b/src/test/java/function/builtin/cons/RESTTest.java
similarity index 100%
rename from src/test/function/builtin/cons/RESTTest.java
rename to src/test/java/function/builtin/cons/RESTTest.java
diff --git a/src/test/function/builtin/math/DIVIDETest.java b/src/test/java/function/builtin/math/DIVIDETest.java
similarity index 100%
rename from src/test/function/builtin/math/DIVIDETest.java
rename to src/test/java/function/builtin/math/DIVIDETest.java
diff --git a/src/test/function/builtin/math/MINUSTest.java b/src/test/java/function/builtin/math/MINUSTest.java
similarity index 100%
rename from src/test/function/builtin/math/MINUSTest.java
rename to src/test/java/function/builtin/math/MINUSTest.java
diff --git a/src/test/function/builtin/math/MODULOTest.java b/src/test/java/function/builtin/math/MODULOTest.java
similarity index 100%
rename from src/test/function/builtin/math/MODULOTest.java
rename to src/test/java/function/builtin/math/MODULOTest.java
diff --git a/src/test/function/builtin/math/MULTIPLYTest.java b/src/test/java/function/builtin/math/MULTIPLYTest.java
similarity index 100%
rename from src/test/function/builtin/math/MULTIPLYTest.java
rename to src/test/java/function/builtin/math/MULTIPLYTest.java
diff --git a/src/test/function/builtin/math/PLUSTest.java b/src/test/java/function/builtin/math/PLUSTest.java
similarity index 100%
rename from src/test/function/builtin/math/PLUSTest.java
rename to src/test/java/function/builtin/math/PLUSTest.java
diff --git a/src/test/function/builtin/math/REMAINDERTest.java b/src/test/java/function/builtin/math/REMAINDERTest.java
similarity index 100%
rename from src/test/function/builtin/math/REMAINDERTest.java
rename to src/test/java/function/builtin/math/REMAINDERTest.java
diff --git a/src/test/function/builtin/predicate/ATOMTest.java b/src/test/java/function/builtin/predicate/ATOMTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/ATOMTest.java
rename to src/test/java/function/builtin/predicate/ATOMTest.java
diff --git a/src/test/function/builtin/predicate/EQTest.java b/src/test/java/function/builtin/predicate/EQTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/EQTest.java
rename to src/test/java/function/builtin/predicate/EQTest.java
diff --git a/src/test/function/builtin/predicate/EQUALTest.java b/src/test/java/function/builtin/predicate/EQUALTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/EQUALTest.java
rename to src/test/java/function/builtin/predicate/EQUALTest.java
diff --git a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java b/src/test/java/function/builtin/predicate/GENSYM_EQUALTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/GENSYM_EQUALTest.java
rename to src/test/java/function/builtin/predicate/GENSYM_EQUALTest.java
diff --git a/src/test/function/builtin/predicate/LISTPTest.java b/src/test/java/function/builtin/predicate/LISTPTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/LISTPTest.java
rename to src/test/java/function/builtin/predicate/LISTPTest.java
diff --git a/src/test/function/builtin/predicate/NULLTest.java b/src/test/java/function/builtin/predicate/NULLTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/NULLTest.java
rename to src/test/java/function/builtin/predicate/NULLTest.java
diff --git a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java b/src/test/java/function/builtin/predicate/NUMERIC_EQUALTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
rename to src/test/java/function/builtin/predicate/NUMERIC_EQUALTest.java
diff --git a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java b/src/test/java/function/builtin/predicate/NUMERIC_GREATERTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
rename to src/test/java/function/builtin/predicate/NUMERIC_GREATERTest.java
diff --git a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java b/src/test/java/function/builtin/predicate/NUMERIC_LESSTest.java
similarity index 100%
rename from src/test/function/builtin/predicate/NUMERIC_LESSTest.java
rename to src/test/java/function/builtin/predicate/NUMERIC_LESSTest.java
diff --git a/src/test/function/builtin/special/ANDTest.java b/src/test/java/function/builtin/special/ANDTest.java
similarity index 100%
rename from src/test/function/builtin/special/ANDTest.java
rename to src/test/java/function/builtin/special/ANDTest.java
diff --git a/src/test/function/builtin/special/CASETest.java b/src/test/java/function/builtin/special/CASETest.java
similarity index 100%
rename from src/test/function/builtin/special/CASETest.java
rename to src/test/java/function/builtin/special/CASETest.java
diff --git a/src/test/function/builtin/special/CONDTest.java b/src/test/java/function/builtin/special/CONDTest.java
similarity index 100%
rename from src/test/function/builtin/special/CONDTest.java
rename to src/test/java/function/builtin/special/CONDTest.java
diff --git a/src/test/function/builtin/special/DEFINE_SPECIALTest.java b/src/test/java/function/builtin/special/DEFINE_SPECIALTest.java
similarity index 100%
rename from src/test/function/builtin/special/DEFINE_SPECIALTest.java
rename to src/test/java/function/builtin/special/DEFINE_SPECIALTest.java
diff --git a/src/test/function/builtin/special/DEFMACROTest.java b/src/test/java/function/builtin/special/DEFMACROTest.java
similarity index 100%
rename from src/test/function/builtin/special/DEFMACROTest.java
rename to src/test/java/function/builtin/special/DEFMACROTest.java
diff --git a/src/test/function/builtin/special/DEFUNTest.java b/src/test/java/function/builtin/special/DEFUNTest.java
similarity index 100%
rename from src/test/function/builtin/special/DEFUNTest.java
rename to src/test/java/function/builtin/special/DEFUNTest.java
diff --git a/src/test/function/builtin/special/FUSETest.java b/src/test/java/function/builtin/special/FUSETest.java
similarity index 100%
rename from src/test/function/builtin/special/FUSETest.java
rename to src/test/java/function/builtin/special/FUSETest.java
diff --git a/src/test/function/builtin/special/IFTest.java b/src/test/java/function/builtin/special/IFTest.java
similarity index 100%
rename from src/test/function/builtin/special/IFTest.java
rename to src/test/java/function/builtin/special/IFTest.java
diff --git a/src/test/function/builtin/special/LAMBDATest.java b/src/test/java/function/builtin/special/LAMBDATest.java
similarity index 100%
rename from src/test/function/builtin/special/LAMBDATest.java
rename to src/test/java/function/builtin/special/LAMBDATest.java
diff --git a/src/test/function/builtin/special/LETTest.java b/src/test/java/function/builtin/special/LETTest.java
similarity index 100%
rename from src/test/function/builtin/special/LETTest.java
rename to src/test/java/function/builtin/special/LETTest.java
diff --git a/src/test/function/builtin/special/LET_STARTest.java b/src/test/java/function/builtin/special/LET_STARTest.java
similarity index 100%
rename from src/test/function/builtin/special/LET_STARTest.java
rename to src/test/java/function/builtin/special/LET_STARTest.java
diff --git a/src/test/function/builtin/special/ORTest.java b/src/test/java/function/builtin/special/ORTest.java
similarity index 100%
rename from src/test/function/builtin/special/ORTest.java
rename to src/test/java/function/builtin/special/ORTest.java
diff --git a/src/test/function/builtin/special/PROGNTest.java b/src/test/java/function/builtin/special/PROGNTest.java
similarity index 100%
rename from src/test/function/builtin/special/PROGNTest.java
rename to src/test/java/function/builtin/special/PROGNTest.java
diff --git a/src/test/function/builtin/special/QUOTETest.java b/src/test/java/function/builtin/special/QUOTETest.java
similarity index 100%
rename from src/test/function/builtin/special/QUOTETest.java
rename to src/test/java/function/builtin/special/QUOTETest.java
diff --git a/src/test/function/builtin/special/RECURTest.java b/src/test/java/function/builtin/special/RECURTest.java
similarity index 100%
rename from src/test/function/builtin/special/RECURTest.java
rename to src/test/java/function/builtin/special/RECURTest.java
diff --git a/src/test/function/builtin/special/SETQTest.java b/src/test/java/function/builtin/special/SETQTest.java
similarity index 100%
rename from src/test/function/builtin/special/SETQTest.java
rename to src/test/java/function/builtin/special/SETQTest.java
diff --git a/src/test/function/builtin/test-files/load-bad.lisp b/src/test/java/function/builtin/test-files/load-bad.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/load-bad.lisp
rename to src/test/java/function/builtin/test-files/load-bad.lisp
diff --git a/src/test/function/builtin/test-files/load-good.lisp b/src/test/java/function/builtin/test-files/load-good.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/load-good.lisp
rename to src/test/java/function/builtin/test-files/load-good.lisp
diff --git a/src/test/function/builtin/test-files/nested/included.lisp b/src/test/java/function/builtin/test-files/nested/included.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/nested/included.lisp
rename to src/test/java/function/builtin/test-files/nested/included.lisp
diff --git a/src/test/function/builtin/test-files/nested/nested.lisp b/src/test/java/function/builtin/test-files/nested/nested.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/nested/nested.lisp
rename to src/test/java/function/builtin/test-files/nested/nested.lisp
diff --git a/src/test/function/builtin/test-files/nested/one/load-one.lisp b/src/test/java/function/builtin/test-files/nested/one/load-one.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/nested/one/load-one.lisp
rename to src/test/java/function/builtin/test-files/nested/one/load-one.lisp
diff --git a/src/test/function/builtin/test-files/nested/one/two/load-two.lisp b/src/test/java/function/builtin/test-files/nested/one/two/load-two.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/nested/one/two/load-two.lisp
rename to src/test/java/function/builtin/test-files/nested/one/two/load-two.lisp
diff --git a/src/test/function/builtin/test-files/nested/one/two/three/load-three.lisp b/src/test/java/function/builtin/test-files/nested/one/two/three/load-three.lisp
similarity index 100%
rename from src/test/function/builtin/test-files/nested/one/two/three/load-three.lisp
rename to src/test/java/function/builtin/test-files/nested/one/two/three/load-three.lisp
diff --git a/src/test/interpreter/LispInterpreterTest.java b/src/test/java/interpreter/LispInterpreterTest.java
similarity index 100%
rename from src/test/interpreter/LispInterpreterTest.java
rename to src/test/java/interpreter/LispInterpreterTest.java
diff --git a/src/test/interpreter/test-files/file.lisp b/src/test/java/interpreter/test-files/file.lisp
similarity index 100%
rename from src/test/interpreter/test-files/file.lisp
rename to src/test/java/interpreter/test-files/file.lisp
diff --git a/src/test/parser/LispParserTest.java b/src/test/java/parser/LispParserTest.java
similarity index 100%
rename from src/test/parser/LispParserTest.java
rename to src/test/java/parser/LispParserTest.java
diff --git a/src/test/recursion/TailCallTest.java b/src/test/java/recursion/TailCallTest.java
similarity index 100%
rename from src/test/recursion/TailCallTest.java
rename to src/test/java/recursion/TailCallTest.java
diff --git a/src/test/scanner/LispCommentRemovingInputStreamTest.java b/src/test/java/scanner/LispCommentRemovingInputStreamTest.java
similarity index 100%
rename from src/test/scanner/LispCommentRemovingInputStreamTest.java
rename to src/test/java/scanner/LispCommentRemovingInputStreamTest.java
diff --git a/src/test/scanner/LispScannerLineColumnTest.java b/src/test/java/scanner/LispScannerLineColumnTest.java
similarity index 100%
rename from src/test/scanner/LispScannerLineColumnTest.java
rename to src/test/java/scanner/LispScannerLineColumnTest.java
diff --git a/src/test/scanner/LispScannerTextTest.java b/src/test/java/scanner/LispScannerTextTest.java
similarity index 100%
rename from src/test/scanner/LispScannerTextTest.java
rename to src/test/java/scanner/LispScannerTextTest.java
diff --git a/src/test/scanner/LispScannerTypeTest.java b/src/test/java/scanner/LispScannerTypeTest.java
similarity index 100%
rename from src/test/scanner/LispScannerTypeTest.java
rename to src/test/java/scanner/LispScannerTypeTest.java
diff --git a/src/test/sexpression/SExpressionTest.java b/src/test/java/sexpression/SExpressionTest.java
similarity index 100%
rename from src/test/sexpression/SExpressionTest.java
rename to src/test/java/sexpression/SExpressionTest.java
diff --git a/src/test/stream/SafeInputStreamTest.java b/src/test/java/stream/SafeInputStreamTest.java
similarity index 100%
rename from src/test/stream/SafeInputStreamTest.java
rename to src/test/java/stream/SafeInputStreamTest.java
diff --git a/src/test/stream/SafeOutputStreamTest.java b/src/test/java/stream/SafeOutputStreamTest.java
similarity index 100%
rename from src/test/stream/SafeOutputStreamTest.java
rename to src/test/java/stream/SafeOutputStreamTest.java
diff --git a/src/test/table/ExecutionContextTest.java b/src/test/java/table/ExecutionContextTest.java
similarity index 100%
rename from src/test/table/ExecutionContextTest.java
rename to src/test/java/table/ExecutionContextTest.java
diff --git a/src/test/table/FunctionTableTest.java b/src/test/java/table/FunctionTableTest.java
similarity index 100%
rename from src/test/table/FunctionTableTest.java
rename to src/test/java/table/FunctionTableTest.java
diff --git a/src/test/table/SymbolTableTest.java b/src/test/java/table/SymbolTableTest.java
similarity index 100%
rename from src/test/table/SymbolTableTest.java
rename to src/test/java/table/SymbolTableTest.java
diff --git a/src/test/terminal/ControlSequenceHandlerTest.java b/src/test/java/terminal/ControlSequenceHandlerTest.java
similarity index 100%
rename from src/test/terminal/ControlSequenceHandlerTest.java
rename to src/test/java/terminal/ControlSequenceHandlerTest.java
diff --git a/src/test/terminal/ControlSequenceTest.java b/src/test/java/terminal/ControlSequenceTest.java
similarity index 100%
rename from src/test/terminal/ControlSequenceTest.java
rename to src/test/java/terminal/ControlSequenceTest.java
diff --git a/src/test/terminal/FlushListener.java b/src/test/java/terminal/FlushListener.java
similarity index 100%
rename from src/test/terminal/FlushListener.java
rename to src/test/java/terminal/FlushListener.java
diff --git a/src/test/terminal/LispTerminalTest.java b/src/test/java/terminal/LispTerminalTest.java
similarity index 100%
rename from src/test/terminal/LispTerminalTest.java
rename to src/test/java/terminal/LispTerminalTest.java
diff --git a/src/test/terminal/TerminalConfigurationTest.java b/src/test/java/terminal/TerminalConfigurationTest.java
similarity index 100%
rename from src/test/terminal/TerminalConfigurationTest.java
rename to src/test/java/terminal/TerminalConfigurationTest.java
diff --git a/src/test/terminal/TerminalHistoryTest.java b/src/test/java/terminal/TerminalHistoryTest.java
similarity index 100%
rename from src/test/terminal/TerminalHistoryTest.java
rename to src/test/java/terminal/TerminalHistoryTest.java
diff --git a/src/test/terminal/VirtualTerminalInteractor.java b/src/test/java/terminal/VirtualTerminalInteractor.java
similarity index 100%
rename from src/test/terminal/VirtualTerminalInteractor.java
rename to src/test/java/terminal/VirtualTerminalInteractor.java
diff --git a/src/test/testutil/SymbolAndFunctionCleaner.java b/src/test/java/testutil/SymbolAndFunctionCleaner.java
similarity index 100%
rename from src/test/testutil/SymbolAndFunctionCleaner.java
rename to src/test/java/testutil/SymbolAndFunctionCleaner.java
diff --git a/src/test/testutil/TestUtilities.java b/src/test/java/testutil/TestUtilities.java
similarity index 100%
rename from src/test/testutil/TestUtilities.java
rename to src/test/java/testutil/TestUtilities.java
diff --git a/src/test/testutil/TypeAssertions.java b/src/test/java/testutil/TypeAssertions.java
similarity index 100%
rename from src/test/testutil/TypeAssertions.java
rename to src/test/java/testutil/TypeAssertions.java
diff --git a/src/test/token/TokenFactoryTest.java b/src/test/java/token/TokenFactoryTest.java
similarity index 100%
rename from src/test/token/TokenFactoryTest.java
rename to src/test/java/token/TokenFactoryTest.java
diff --git a/src/test/util/CharactersTest.java b/src/test/java/util/CharactersTest.java
similarity index 100%
rename from src/test/util/CharactersTest.java
rename to src/test/java/util/CharactersTest.java
diff --git a/src/test/util/PathTest.java b/src/test/java/util/PathTest.java
similarity index 100%
rename from src/test/util/PathTest.java
rename to src/test/java/util/PathTest.java