From 7b5a6483b91d771335e7bd197a3379523d727a22 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Fri, 16 Mar 2018 20:18:15 -0400
Subject: [PATCH 01/16] Switch to intellij idea

---
 .classpath                                 | 31 ----------------------
 .gitignore                                 |  7 ++++-
 .idea/compiler.xml                         | 16 +++++++++++
 .idea/encodings.xml                        |  6 +++++
 .idea/misc.xml                             | 13 +++++++++
 .idea/modules.xml                          |  8 ++++++
 .idea/runConfigurations/Build.xml          | 27 +++++++++++++++++++
 .idea/runConfigurations/FitNesse.xml       | 11 ++++++++
 .idea/runConfigurations/Test.xml           | 23 ++++++++++++++++
 .idea/vcs.xml                              |  6 +++++
 .project                                   | 29 --------------------
 .settings/FitNesse.launch                  |  6 -----
 .settings/Transcendental Lisp.launch       | 21 ---------------
 .settings/clean verify.launch              | 16 -----------
 .settings/org.eclipse.core.resources.prefs |  5 ----
 .settings/org.eclipse.jdt.core.prefs       | 13 ---------
 .settings/org.eclipse.m2e.core.prefs       |  4 ---
 17 files changed, 116 insertions(+), 126 deletions(-)
 delete mode 100644 .classpath
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/runConfigurations/Build.xml
 create mode 100644 .idea/runConfigurations/FitNesse.xml
 create mode 100644 .idea/runConfigurations/Test.xml
 create mode 100644 .idea/vcs.xml
 delete mode 100644 .project
 delete mode 100644 .settings/FitNesse.launch
 delete mode 100644 .settings/Transcendental Lisp.launch
 delete mode 100644 .settings/clean verify.launch
 delete mode 100644 .settings/org.eclipse.core.resources.prefs
 delete mode 100644 .settings/org.eclipse.jdt.core.prefs
 delete mode 100644 .settings/org.eclipse.m2e.core.prefs

diff --git a/.classpath b/.classpath
deleted file mode 100644
index de63c7f..0000000
--- a/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="test">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="lisp/lang">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 6257025..4b9f633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,12 @@
+.idea/**/libraries
+.idea/**/tasks.xml
+.idea/**/workspace.xml
+.idea/dictionaries
 fitnesse/FitNesseRoot/files
 fitnesse/FitNesseRoot/FitNesse/UserGuide/
 fitnesse/fitnesse-results
 target/
+*.iml
 *.swp
 *.zip
-dependency-reduced-pom.xml
\ No newline at end of file
+dependency-reduced-pom.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..e2a4e14
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="transcendental-lisp" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="transcendental-lisp" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..b26911b
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d30d09e
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..08fa5bd
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/transcendental-lisp.iml" filepath="$PROJECT_DIR$/transcendental-lisp.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build.xml
new file mode 100644
index 0000000..0656015
--- /dev/null
+++ b/.idea/runConfigurations/Build.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build" type="MavenRunConfiguration" factoryName="Maven">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="verify" />
+            </list>
+          </option>
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/FitNesse.xml b/.idea/runConfigurations/FitNesse.xml
new file mode 100644
index 0000000..fde6d44
--- /dev/null
+++ b/.idea/runConfigurations/FitNesse.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="FitNesse" type="JarApplication" factoryName="JAR Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="JAR_PATH" value="$PROJECT_DIR$/fitnesse/fitnesse-standalone.jar" />
+    <option name="PROGRAM_PARAMETERS" value="-p 5150 -d fitnesse" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
new file mode 100644
index 0000000..82d89d4
--- /dev/null
+++ b/.idea/runConfigurations/Test.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test" type="JUnit" factoryName="JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <module name="" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="wholeProject" />
+    </option>
+    <envs />
+    <patterns />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.project b/.project
deleted file mode 100644
index d3d6477..0000000
--- a/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Transcendental Lisp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/FitNesse.launch b/.settings/FitNesse.launch
deleted file mode 100644
index 7cca533..0000000
--- a/.settings/FitNesse.launch
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/java"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-jar fitnesse/fitnesse-standalone.jar -p 5150 -d fitnesse"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Transcendental Lisp}"/>
-</launchConfiguration>
diff --git a/.settings/Transcendental Lisp.launch b/.settings/Transcendental Lisp.launch
deleted file mode 100644
index d9e521e..0000000
--- a/.settings/Transcendental Lisp.launch	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Transcendental Lisp"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.eclemma.core.SCOPE_IDS">
-<listEntry value="=Transcendental Lisp/src"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=Transcendental Lisp"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Transcendental Lisp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-</launchConfiguration>
diff --git a/.settings/clean verify.launch b/.settings/clean verify.launch
deleted file mode 100644
index 5ea1e4d..0000000
--- a/.settings/clean verify.launch	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean verify"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<stringAttribute key="M2_USER_SETTINGS" value=""/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:Transcendental Lisp}"/>
-</launchConfiguration>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 911ca7a..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//lisp/lang=UTF-8
-encoding/<project>=UTF-8
-encoding/src=UTF-8
-encoding/test=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 13b3428..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

From 529dfa473b13a121ed2a8d8557c3f1d6df722834 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Fri, 16 Mar 2018 20:44:00 -0400
Subject: [PATCH 02/16] Format pom.xml file

---
 .idea/codeStyles/Project.xml         | 12 ++++++++++++
 .idea/codeStyles/codeStyleConfig.xml |  5 +++++
 .idea/runConfigurations/FitNesse.xml |  2 +-
 pom.xml                              |  7 +++----
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..431b78d
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,12 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <XML>
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/FitNesse.xml b/.idea/runConfigurations/FitNesse.xml
index fde6d44..8ddf06f 100644
--- a/.idea/runConfigurations/FitNesse.xml
+++ b/.idea/runConfigurations/FitNesse.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="FitNesse" type="JarApplication" factoryName="JAR Application">
+  <configuration default="false" name="FitNesse" type="JarApplication" factoryName="JAR Application" singleton="true">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="JAR_PATH" value="$PROJECT_DIR$/fitnesse/fitnesse-standalone.jar" />
     <option name="PROGRAM_PARAMETERS" value="-p 5150 -d fitnesse" />
diff --git a/pom.xml b/pom.xml
index bebc9c3..29af419 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,6 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 

From 114a3e430900341ca163c5d49ad939852ee7d497 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 09:23:10 -0400
Subject: [PATCH 03/16] Refactor source code directories

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

diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt
index 6d9cd40..c3b94a3 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt
@@ -1,12 +1,12 @@
-There are cases when you want to copy and append the last row of your column or row fixture certain number of times.
-
-For Ex: We make a query to the database and it return certain record 'n' number of times. Instead of writing the same record 'n' number of times in your fitnesse page, you can just specify that you expect the last column 'n' number of times using the !-CopyAndAppendLastRow-! decorator.
-
-!|Copy and Append Last Row|100|number of times|
-|Division|
-|numerator|denominator|quotient()|
-|10|2|5|
-|12.6|3|4.2|
-|100|4|25|
-
-In the above example, we want to divide 100 by 4 101 times.
+There are cases when you want to copy and append the last row of your column or row fixture certain number of times.
+
+For Ex: We make a query to the database and it return certain record 'n' number of times. Instead of writing the same record 'n' number of times in your fitnesse page, you can just specify that you expect the last column 'n' number of times using the !-CopyAndAppendLastRow-! decorator.
+
+!|Copy and Append Last Row|100|number of times|
+|Division|
+|numerator|denominator|quotient()|
+|10|2|5|
+|12.6|3|4.2|
+|100|4|25|
+
+In the above example, we want to divide 100 by 4 101 times.
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml
index 4646681..11ec60d 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<properties>
-  <Edit/>
-  <Files/>
-  <LastModified>20061216213113</LastModified>
-  <Properties/>
-  <RecentChanges/>
-  <Test/>
-  <WhereUsed/>
-  <saveId>1166322673244</saveId>
-  <secure-write/>
-  <ticketId>524008525574625139</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Edit/>
+  <Files/>
+  <LastModified>20061216213113</LastModified>
+  <Properties/>
+  <RecentChanges/>
+  <Test/>
+  <WhereUsed/>
+  <saveId>1166322673244</saveId>
+  <secure-write/>
+  <ticketId>524008525574625139</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt
index 58c220f..2f3a42e 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt
@@ -1,12 +1,12 @@
-What if you want to call the fixture 'n' times with the same row except you want to update one or two column's value?
-
-Ex: If you are using fitnesse fixtures to populate database and you want to insert a record 500 times. It would be easy to write one model record and insert that 500 times. This can be easily done with the !-CopyAndAppendLastRow-! decorator. But the database table might have a primary key. So you might want to update the primary key in each row. Now you might want to pipe !-IncrementColumnsValue-! and !-CopyAndAppendLastRow-! decorators to get the job done.
-
-Here is an example where I want to divide 5 by 1, 100 times, but I also want to update the numerator by 5 and denominator by 1.
-
-!|Copy and Append Last Row|100|times|
-|Increment Columns Value|numerator|of type|int|by|5|
-|Increment Columns Value|denominator|of type|int|by|1|
-|Division|
-|numerator|denominator|quotient()|
-|5|1|5|
+What if you want to call the fixture 'n' times with the same row except you want to update one or two column's value?
+
+Ex: If you are using fitnesse fixtures to populate database and you want to insert a record 500 times. It would be easy to write one model record and insert that 500 times. This can be easily done with the !-CopyAndAppendLastRow-! decorator. But the database table might have a primary key. So you might want to update the primary key in each row. Now you might want to pipe !-IncrementColumnsValue-! and !-CopyAndAppendLastRow-! decorators to get the job done.
+
+Here is an example where I want to divide 5 by 1, 100 times, but I also want to update the numerator by 5 and denominator by 1.
+
+!|Copy and Append Last Row|100|times|
+|Increment Columns Value|numerator|of type|int|by|5|
+|Increment Columns Value|denominator|of type|int|by|1|
+|Division|
+|numerator|denominator|quotient()|
+|5|1|5|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml
index 248425b..6c8103c 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<properties>
-  <Edit/>
-  <Files/>
-  <LastModified>20061216215829</LastModified>
-  <Properties/>
-  <RecentChanges/>
-  <Test/>
-  <WhereUsed/>
-  <saveId>1166324308994</saveId>
-  <secure-write/>
-  <ticketId>-8528063939302055872</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Edit/>
+  <Files/>
+  <LastModified>20061216215829</LastModified>
+  <Properties/>
+  <RecentChanges/>
+  <Test/>
+  <WhereUsed/>
+  <saveId>1166324308994</saveId>
+  <secure-write/>
+  <ticketId>-8528063939302055872</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt
index 6bf4596..8327a35 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt
@@ -1,4 +1,4 @@
-!|Import|
-|fit.decorator|
-|fit.decorator.performance|
-|eg|
+!|Import|
+|fit.decorator|
+|fit.decorator.performance|
+|eg|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml
index 47bf822..e92b349 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
-<properties>
-  <Edit>true</Edit>
-  <Files>true</Files>
-  <LastModified>20061216183948</LastModified>
-  <Properties>true</Properties>
-  <RecentChanges>true</RecentChanges>
-  <Refactor>true</Refactor>
-  <Search>true</Search>
-  <Versions>true</Versions>
-  <WhereUsed>true</WhereUsed>
-  <saveId>1166312388007</saveId>
-  <ticketId>-6757238585913794424</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Edit>true</Edit>
+  <Files>true</Files>
+  <LastModified>20061216183948</LastModified>
+  <Properties>true</Properties>
+  <RecentChanges>true</RecentChanges>
+  <Refactor>true</Refactor>
+  <Search>true</Search>
+  <Versions>true</Versions>
+  <WhereUsed>true</WhereUsed>
+  <saveId>1166312388007</saveId>
+  <ticketId>-6757238585913794424</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt
index 7931d99..c69b2ee 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt
@@ -1 +1 @@
-!|fit.Summary|
+!|fit.Summary|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml
index b7f5c22..e825712 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
-<properties>
-  <Edit>true</Edit>
-  <Files>true</Files>
-  <LastModified>20061216141632</LastModified>
-  <Properties>true</Properties>
-  <RecentChanges>true</RecentChanges>
-  <Refactor>true</Refactor>
-  <Search>true</Search>
-  <Versions>true</Versions>
-  <WhereUsed>true</WhereUsed>
-  <saveId>1166296592283</saveId>
-  <ticketId>-5128325404176707243</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Edit>true</Edit>
+  <Files>true</Files>
+  <LastModified>20061216141632</LastModified>
+  <Properties>true</Properties>
+  <RecentChanges>true</RecentChanges>
+  <Refactor>true</Refactor>
+  <Search>true</Search>
+  <Versions>true</Versions>
+  <WhereUsed>true</WhereUsed>
+  <saveId>1166296592283</saveId>
+  <ticketId>-5128325404176707243</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt
index b10df64..4aba643 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt
@@ -1,145 +1,145 @@
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-
-
-Test Strings by plain compare, neither custom compare nor regular expression.
-In this case detailed diff is wanted.
-
-| Detailed Diff |
-| actual string | expected string? | #comment                                                  |
-| abc           | abc              | equal                                                     |
-| abc           | xyz              | completly different                                       |
-| abc           | xbc              | first char different                                      |
-| abc           | ayc              | middle char different                                     |
-| abc           | abz              | last char different                                       |
-|               | xyz              | actual empty, expected filled                             |
-| abc           |                  | actual filled, expected empty; will be counted as ignored |
-| <&>           | <&>              | equal with HTML special chars                             |
-| <&>           | xyz              | completly different with HTML special chars               |
-| <&>           | x&>              | first char different with HTML special chars              |
-| <&>           | <y>              | middle char different with HTML special chars             |
-| <&>           | <&z              | last char differentwith HTML special chars                |
-|               | <&>              | actual empty, expected filled with HTML special chars     |
-| abc           | <&>              | completly different with HTML special chars               |
-| abc           | <bc              | first char different with HTML special chars              |
-| abc           | a&c              | middle char different with HTML special chars             |
-| abc           | ab>              | last char different with HTML special chars               |
-| Hello World   | Wellcome Lord    | no obvious match                                          |
-
-Test Strings by regular expression.
-In this case no detailed diff is wanted.
-
-| Detailed Diff |
-| actual string | expected string? | #comment |
-| abc           | =~/abc/          | match    |
-| abc           | =~/a.c/          | match    |
-| abc           | =~/\w+/          | match    |
-| abc           | =~/\w{3}/        | match    |
-| abc           | =~/^\w{3}$/      | match    |
-| abc           | =~/\w{1}/        | match    |
-| abc           | =~/^\w{1}$/      | no match |
-| abc           | =~/[ABC]+/       | no match |
-| abc           | =~/[ABC]+/i      | wrong syntax, disable value comparison, use string comparison |
-
-
-Test integers by string comparison.
-In this case detailed diff ist wanted.
-
-| Detailed Diff |
-| actual int | expected int? | #comment |
-| 1          | 1             | equal    |
-| 1          | 2             | completly different |
-| 1          | 10            | partially different |
-|            | 1             | completly different |
-
-Test integers by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
-In this case no detailed diff is wanted.
-
-| Detailed Diff |
-| actual int | expected int? | #comment |
-| 1          | >=1           | ok |
-| 1          | <2            | ok |
-| 1          | >1            | nok |
-| 1          | =1            | ok |
-| 1          | <1            | nok |
-| 1          | 0<_<2         | ok |
-| 1          | 2<_<0         | nok, logically wrong |
-| 1          | 0>_>2         | wrong syntax, disable value comparison, use string comparison |
-| 1          | 2>_>0         | wrong syntax, disable value comparison, use string comparison |
-
-
-Test doubles by string comparison.
-In this case detailed diff ist wanted.
-
-| Detailed Diff |
-| actual double | expected double? | #comment |
-| 1.0           | 1.0              | equal    |
-| 1.1           | 222              | completly different |
-| 1.0           | 10               | partially different |
-|               | 1.0              | partially different |
-
-Test doubles by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
-In this case no detailed diff is wanted.
-
-| Detailed Diff |
-| actual double | expected double? | #comment |
-| 1             | >=1              | ok |
-| 1             | <2               | ok |
-| 1             | >1               | nok |
-| 1             | =1               | ok |
-| 1             | <1               | nok |
-| 1             | 0<_<2            | ok |
-| 1             | 2<_<0            | nok, logically wrong |
-| 1             | 0>_>2            | wrong syntax, disable value comparison, use string comparison |
-| 1             | 2>_>0            | wrong syntax, disable value comparison, use string comparison |
-| 1.0           | ~=1              | ok |
-| 1.1           | ~=1              | ok |
-| 0.9           | ~=1              | ok |
-| 1.0           | ~=1.0            | ok |
-| 1.1           | ~=1.0            | nok |
-| 0.9           | ~=1.0            | nok |
-
-
-Test symbols by string comparison.
-
-| Detailed Diff |
-| actual symbol | expected symbol? | #comment |
-| abc           | $symbol=         | |
-| $symbol       | abc              | |
-| $symbol       | xyz              | |
-| $symbol       | xbc              | |
-| $symbol       | ayc              | |
-| $symbol       | abz              | |
-| abc           | $symbol          | |
-| xyz           | $symbol          | |
-| xbc           | $symbol          | |
-| ayc           | $symbol          | |
-| abz           | $symbol          | |
-|               | $symbol          | |
-
-
-Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile
-The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String).
-
-| script | Detailed Diff |
-| note  | everything not equals to 'abc' is ok |
-| check | echo | abc | inverse:xyz |
-| note  | everything not equals to 'abc' is ok |
-| check | echo | abc | inverse:ABC | 
-| note  | everthing not equals to 'abc' is ok |
-| check | echo | abc | inverse:cba | 
-| note  | only 'abc' is nok |
-| check | echo | abc | inverse:abc |
-
-
-Test Scenario and Script
-
-!| Scenario | Detailed Diff Scenario Test |
-| start | Detailed Diff |
-| check | echo | hello | hello |
-| check | echo | hello | hallo |
-
-!| Script |
-| Detailed Diff Scenario Test |
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+
+
+Test Strings by plain compare, neither custom compare nor regular expression.
+In this case detailed diff is wanted.
+
+| Detailed Diff |
+| actual string | expected string? | #comment                                                  |
+| abc           | abc              | equal                                                     |
+| abc           | xyz              | completly different                                       |
+| abc           | xbc              | first char different                                      |
+| abc           | ayc              | middle char different                                     |
+| abc           | abz              | last char different                                       |
+|               | xyz              | actual empty, expected filled                             |
+| abc           |                  | actual filled, expected empty; will be counted as ignored |
+| <&>           | <&>              | equal with HTML special chars                             |
+| <&>           | xyz              | completly different with HTML special chars               |
+| <&>           | x&>              | first char different with HTML special chars              |
+| <&>           | <y>              | middle char different with HTML special chars             |
+| <&>           | <&z              | last char differentwith HTML special chars                |
+|               | <&>              | actual empty, expected filled with HTML special chars     |
+| abc           | <&>              | completly different with HTML special chars               |
+| abc           | <bc              | first char different with HTML special chars              |
+| abc           | a&c              | middle char different with HTML special chars             |
+| abc           | ab>              | last char different with HTML special chars               |
+| Hello World   | Wellcome Lord    | no obvious match                                          |
+
+Test Strings by regular expression.
+In this case no detailed diff is wanted.
+
+| Detailed Diff |
+| actual string | expected string? | #comment |
+| abc           | =~/abc/          | match    |
+| abc           | =~/a.c/          | match    |
+| abc           | =~/\w+/          | match    |
+| abc           | =~/\w{3}/        | match    |
+| abc           | =~/^\w{3}$/      | match    |
+| abc           | =~/\w{1}/        | match    |
+| abc           | =~/^\w{1}$/      | no match |
+| abc           | =~/[ABC]+/       | no match |
+| abc           | =~/[ABC]+/i      | wrong syntax, disable value comparison, use string comparison |
+
+
+Test integers by string comparison.
+In this case detailed diff ist wanted.
+
+| Detailed Diff |
+| actual int | expected int? | #comment |
+| 1          | 1             | equal    |
+| 1          | 2             | completly different |
+| 1          | 10            | partially different |
+|            | 1             | completly different |
+
+Test integers by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
+In this case no detailed diff is wanted.
+
+| Detailed Diff |
+| actual int | expected int? | #comment |
+| 1          | >=1           | ok |
+| 1          | <2            | ok |
+| 1          | >1            | nok |
+| 1          | =1            | ok |
+| 1          | <1            | nok |
+| 1          | 0<_<2         | ok |
+| 1          | 2<_<0         | nok, logically wrong |
+| 1          | 0>_>2         | wrong syntax, disable value comparison, use string comparison |
+| 1          | 2>_>0         | wrong syntax, disable value comparison, use string comparison |
+
+
+Test doubles by string comparison.
+In this case detailed diff ist wanted.
+
+| Detailed Diff |
+| actual double | expected double? | #comment |
+| 1.0           | 1.0              | equal    |
+| 1.1           | 222              | completly different |
+| 1.0           | 10               | partially different |
+|               | 1.0              | partially different |
+
+Test doubles by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
+In this case no detailed diff is wanted.
+
+| Detailed Diff |
+| actual double | expected double? | #comment |
+| 1             | >=1              | ok |
+| 1             | <2               | ok |
+| 1             | >1               | nok |
+| 1             | =1               | ok |
+| 1             | <1               | nok |
+| 1             | 0<_<2            | ok |
+| 1             | 2<_<0            | nok, logically wrong |
+| 1             | 0>_>2            | wrong syntax, disable value comparison, use string comparison |
+| 1             | 2>_>0            | wrong syntax, disable value comparison, use string comparison |
+| 1.0           | ~=1              | ok |
+| 1.1           | ~=1              | ok |
+| 0.9           | ~=1              | ok |
+| 1.0           | ~=1.0            | ok |
+| 1.1           | ~=1.0            | nok |
+| 0.9           | ~=1.0            | nok |
+
+
+Test symbols by string comparison.
+
+| Detailed Diff |
+| actual symbol | expected symbol? | #comment |
+| abc           | $symbol=         | |
+| $symbol       | abc              | |
+| $symbol       | xyz              | |
+| $symbol       | xbc              | |
+| $symbol       | ayc              | |
+| $symbol       | abz              | |
+| abc           | $symbol          | |
+| xyz           | $symbol          | |
+| xbc           | $symbol          | |
+| ayc           | $symbol          | |
+| abz           | $symbol          | |
+|               | $symbol          | |
+
+
+Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile
+The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String).
+
+| script | Detailed Diff |
+| note  | everything not equals to 'abc' is ok |
+| check | echo | abc | inverse:xyz |
+| note  | everything not equals to 'abc' is ok |
+| check | echo | abc | inverse:ABC | 
+| note  | everthing not equals to 'abc' is ok |
+| check | echo | abc | inverse:cba | 
+| note  | only 'abc' is nok |
+| check | echo | abc | inverse:abc |
+
+
+Test Scenario and Script
+
+!| Scenario | Detailed Diff Scenario Test |
+| start | Detailed Diff |
+| check | echo | hello | hello |
+| check | echo | hello | hallo |
+
+!| Script |
+| Detailed Diff Scenario Test |
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml
index 8109798..ecd29df 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<properties>
-<Edit/>
-<Files/>
-<Properties/>
-<Prune/>
-<RecentChanges/>
-<Refactor/>
-<Search/>
-<Test/>
-<Versions/>
-<WhereUsed/>
-</properties>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<properties>
+<Edit/>
+<Files/>
+<Properties/>
+<Prune/>
+<RecentChanges/>
+<Refactor/>
+<Search/>
+<Test/>
+<Versions/>
+<WhereUsed/>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt
index fa4783d..640ac1c 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt
@@ -1,230 +1,230 @@
-!define TEST_SYSTEM {slim}
-
-!3 Diff of failed tests
-
-!4 Original intentionally failing tests
-
-The subordinate page >TestPage collects the following tests. The page is disabled because of many tests fails intentionally. It is useful for manual tests only.
-
-!4 Test wrapper for test
-
-!*> Tests for type string
-
-!| script |
-|given page|TestPage|with content|${SUT_PATH} !-
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-
-Test Strings by plain compare, neither custom compare nor regular expression.
-In this case detailed diff is wanted.
-
-| Detailed Diff |
-| actual string | expected string? | #comment                                                  |
-| abc           | abc              | equal                                                     |
-| abc           | xyz              | completly different                                       |
-| abc           | xbc              | first char different                                      |
-| abc           | ayc              | middle char different                                     |
-| abc           | abz              | last char different                                       |
-|               | xyz              | actual empty, expected filled                             |
-| abc           |                  | actual filled, expected empty; will be counted as ignored |
-| <&>           | <&>              | equal with HTML special chars                             |
-| <&>           | xyz              | completly different with HTML special chars               |
-| <&>           | x&>              | first char different with HTML special chars              |
-| <&>           | <y>              | middle char different with HTML special chars             |
-| <&>           | <&z              | last char differentwith HTML special chars                |
-|               | <&>              | actual empty, expected filled with HTML special chars     |
-| abc           | <&>              | completly different with HTML special chars               |
-| abc           | <bc              | first char different with HTML special chars              |
-| abc           | a&c              | middle char different with HTML special chars             |
-| abc           | ab>              | last char different with HTML special chars               |
-| Hello World   | Wellcome Lord    | no obvious match                                          |
-
-Test Strings by regular expression.
-In this case no detailed diff is wanted.
-
-| Detailed Diff |
-| actual string | expected string? | #comment |
-| abc           | =~/abc/          | match    |
-| abc           | =~/a.c/          | match    |
-| abc           | =~/\w+/          | match    |
-| abc           | =~/\w{3}/        | match    |
-| abc           | =~/^\w{3}$/      | match    |
-| abc           | =~/\w{1}/        | match    |
-| abc           | =~/^\w{1}$/      | no match |
-| abc           | =~/[ABC]+/       | no match |
-| abc           | =~/[ABC]+/i      | wrong syntax, disable value comparison, use string comparison |
--!|
-|test results for page|TestPage|should contain|!-<span class="pass">abc</span>-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">abc</span>] <span class="fail">expected [</span><span class="diff">xyz</span><span class="fail">]</span>-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">a</span>bc] <span class="fail">expected [</span><span class="diff">x</span><span class="fail">bc]</span>-!|
-|test results for page|TestPage|should contain|!-[a<span class="diff">b</span>c] <span class="fail">expected [a</span><span class="diff">y</span><span class="fail">c]</span>-!|
-|test results for page|TestPage|should contain|!-[ab<span class="diff">c</span>] <span class="fail">expected [ab</span><span class="diff">z</span><span class="fail">]</span>-!|
-|test results for page|TestPage|should contain|!-[] <span class="fail">expected [</span><span class="diff">xyz</span><span class="fail">]</span>-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">H</span>ello <span class="diff">W</span>or<span class="diff">l</span>d] <span class="fail">expected [</span><span class="diff">W</span><span class="fail">ell</span><span class="diff">c</span><span class="fail">o</span><span class="diff">me</span><span class="fail"> </span><span class="diff">L</span><span class="fail">ord]-!|
-*!
-
-!*> Tests for type int
-
-!| script |
-|given page|TestPage|with content|${SUT_PATH} !-
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-
-Test integers by string comparison.
-In this case detailed diff ist wanted.
-
-| Detailed Diff |
-| actual int | expected int? | #comment |
-| 1          | 1             | equal    |
-| 1          | 2             | completly different |
-| 1          | 10            | partially different |
-|            | 1             | completly different |
-
-Test integers by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
-In this case no detailed diff is wanted.
-
-| Detailed Diff |
-| actual int | expected int? | #comment |
-| 1          | >=1           | ok |
-| 1          | <2            | ok |
-| 1          | >1            | nok |
-| 1          | =1            | ok |
-| 1          | <1            | nok |
-| 1          | 0<_<2         | ok |
-| 1          | 2<_<0         | nok, logically wrong |
-| 1          | 0>_>2         | wrong syntax, disable value comparison, use string comparison |
-| 1          | 2>_>0         | wrong syntax, disable value comparison, use string comparison |
--!|
-|test results for page|TestPage|should contain||
-*!
-
-!*> Tests for type double
-
-!| script |
-|given page|TestPage|with content|${SUT_PATH} !-
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-
-Test doubles by string comparison.
-In this case detailed diff ist wanted.
-
-| Detailed Diff |
-| actual double | expected double? | #comment |
-| 1.0           | 1.0              | equal    |
-| 1.1           | 222              | completly different |
-| 1.0           | 10               | partially different |
-|               | 1.0              | partially different |
-
-Test doubles by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
-In this case no detailed diff is wanted.
-
-| Detailed Diff |
-| actual double | expected double? | #comment |
-| 1             | >=1              | ok |
-| 1             | <2               | ok |
-| 1             | >1               | nok |
-| 1             | =1               | ok |
-| 1             | <1               | nok |
-| 1             | 0<_<2            | ok |
-| 1             | 2<_<0            | nok, logically wrong |
-| 1             | 0>_>2            | wrong syntax, disable value comparison, use string comparison |
-| 1             | 2>_>0            | wrong syntax, disable value comparison, use string comparison |
-| 1.0           | ~=1              | ok |
-| 1.1           | ~=1              | ok |
-| 0.9           | ~=1              | ok |
-| 1.0           | ~=1.0            | ok |
-| 1.1           | ~=1.0            | nok |
-| 0.9           | ~=1.0            | nok |
--!|
-|test results for page|TestPage|should contain||
-*!
-
-!*> Tests of fitnesse symbols
-
-!| script |
-|given page|TestPage|with content|${SUT_PATH} !-
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-Test symbols by string comparison.
-
-| Detailed Diff |
-| actual symbol | expected symbol? | #comment |
-| abc           | $symbol=         | |
-| $symbol       | abc              | |
-| $symbol       | xyz              | |
-| $symbol       | xbc              | |
-| $symbol       | ayc              | |
-| $symbol       | abz              | |
-| abc           | $symbol          | |
-| xyz           | $symbol          | |
-| xbc           | $symbol          | |
-| ayc           | $symbol          | |
-| abz           | $symbol          | |
-|               | $symbol          | |
--!|
-|test results for page|TestPage|should contain|!-<span class="pass">abc</span>-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">abc</span>] <span class="fail">expected [</span><span class="diff">xyz</span><span class="fail">]</span>-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">a</span>bc] <span class="fail">expected [</span><span class="diff">x</span><span class="fail">bc]</span>-!|
-|test results for page|TestPage|should contain|!-[a<span class="diff">b</span>c] <span class="fail">expected [a</span><span class="diff">y</span><span class="fail">c]</span>-!|
-|test results for page|TestPage|should contain|!-[ab<span class="diff">c</span>] <span class="fail">expected [ab</span><span class="diff">z</span><span class="fail">]</span>-!|
-|test results for page|TestPage|should contain|!-&lt;span class="pass"&gt;$symbol-&gt;[abc]&lt;/span&gt;-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">xyz</span>] <span class="fail">expected [$symbol-&gt;[</span><span class="diff">abc</span><span class="fail">]]</span>-!|
-|test results for page|TestPage|should contain|!-[<span class="diff">x</span>bc] <span class="fail">expected [$symbol-&gt;[</span><span class="diff">a</span><span class="fail">bc]]</span>-!|
-|test results for page|TestPage|should contain|!-[a<span class="diff">y</span>c] <span class="fail">expected [$symbol-&gt;[a</span><span class="diff">b</span><span class="fail">c]]</span>-!|
-|test results for page|TestPage|should contain|!-[ab<span class="diff">z</span>] <span class="fail">expected [$symbol-&gt;[ab</span><span class="diff">c</span><span class="fail">]]</span>-!|
-|test results for page|TestPage|should contain|!-[] <span class="fail">expected [$symbol-&gt;[</span><span class="diff">abc</span><span class="fail">]]</span>-!|
-*!
-
-!*> Tests of custom comparator
-
-!| script |
-|given page|TestPage|with content|${SUT_PATH} !-
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile
-The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String).
-
-| script | Detailed Diff |
-| note  | everything not equals to 'abc' is ok |
-| check | echo | abc | inverse:xyz |
-| note  | everything not equals to 'abc' is ok |
-| check | echo | abc | inverse:ABC | 
-| note  | everthing not equals to 'abc' is ok |
-| check | echo | abc | inverse:cba | 
-| note  | only 'abc' is nok |
-| check | echo | abc | inverse:abc |
--!|
-|test results for page|TestPage|should contain||
-*!
-
-!*> Tests of scenario
-
-!| script |
-|given page|TestPage|with content|${SUT_PATH} !-
-!define TEST_SYSTEM {slim}
-
-!| import |
-| fitnesse.slim.test |
-Test Scenario and Script
-
-!| Scenario | Detailed Diff Scenario Test |
-| start | Detailed Diff |
-| check | echo | hello | hello |
-| check | echo | hello | hallo |
-
-!| Script |
-| Detailed Diff Scenario Test |
--!|
-|test results for page|TestPage|should contain|!-<span class="pass">hello</span>-!|
-|test results for page|TestPage|should contain|!-[h<span class="diff">e</span>llo] <span class="fail">expected [h</span><span class="diff">a</span><span class="fail">llo]</span>-!|
-*!
+!define TEST_SYSTEM {slim}
+
+!3 Diff of failed tests
+
+!4 Original intentionally failing tests
+
+The subordinate page >TestPage collects the following tests. The page is disabled because of many tests fails intentionally. It is useful for manual tests only.
+
+!4 Test wrapper for test
+
+!*> Tests for type string
+
+!| script |
+|given page|TestPage|with content|${SUT_PATH} !-
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+
+Test Strings by plain compare, neither custom compare nor regular expression.
+In this case detailed diff is wanted.
+
+| Detailed Diff |
+| actual string | expected string? | #comment                                                  |
+| abc           | abc              | equal                                                     |
+| abc           | xyz              | completly different                                       |
+| abc           | xbc              | first char different                                      |
+| abc           | ayc              | middle char different                                     |
+| abc           | abz              | last char different                                       |
+|               | xyz              | actual empty, expected filled                             |
+| abc           |                  | actual filled, expected empty; will be counted as ignored |
+| <&>           | <&>              | equal with HTML special chars                             |
+| <&>           | xyz              | completly different with HTML special chars               |
+| <&>           | x&>              | first char different with HTML special chars              |
+| <&>           | <y>              | middle char different with HTML special chars             |
+| <&>           | <&z              | last char differentwith HTML special chars                |
+|               | <&>              | actual empty, expected filled with HTML special chars     |
+| abc           | <&>              | completly different with HTML special chars               |
+| abc           | <bc              | first char different with HTML special chars              |
+| abc           | a&c              | middle char different with HTML special chars             |
+| abc           | ab>              | last char different with HTML special chars               |
+| Hello World   | Wellcome Lord    | no obvious match                                          |
+
+Test Strings by regular expression.
+In this case no detailed diff is wanted.
+
+| Detailed Diff |
+| actual string | expected string? | #comment |
+| abc           | =~/abc/          | match    |
+| abc           | =~/a.c/          | match    |
+| abc           | =~/\w+/          | match    |
+| abc           | =~/\w{3}/        | match    |
+| abc           | =~/^\w{3}$/      | match    |
+| abc           | =~/\w{1}/        | match    |
+| abc           | =~/^\w{1}$/      | no match |
+| abc           | =~/[ABC]+/       | no match |
+| abc           | =~/[ABC]+/i      | wrong syntax, disable value comparison, use string comparison |
+-!|
+|test results for page|TestPage|should contain|!-<span class="pass">abc</span>-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">abc</span>] <span class="fail">expected [</span><span class="diff">xyz</span><span class="fail">]</span>-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">a</span>bc] <span class="fail">expected [</span><span class="diff">x</span><span class="fail">bc]</span>-!|
+|test results for page|TestPage|should contain|!-[a<span class="diff">b</span>c] <span class="fail">expected [a</span><span class="diff">y</span><span class="fail">c]</span>-!|
+|test results for page|TestPage|should contain|!-[ab<span class="diff">c</span>] <span class="fail">expected [ab</span><span class="diff">z</span><span class="fail">]</span>-!|
+|test results for page|TestPage|should contain|!-[] <span class="fail">expected [</span><span class="diff">xyz</span><span class="fail">]</span>-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">H</span>ello <span class="diff">W</span>or<span class="diff">l</span>d] <span class="fail">expected [</span><span class="diff">W</span><span class="fail">ell</span><span class="diff">c</span><span class="fail">o</span><span class="diff">me</span><span class="fail"> </span><span class="diff">L</span><span class="fail">ord]-!|
+*!
+
+!*> Tests for type int
+
+!| script |
+|given page|TestPage|with content|${SUT_PATH} !-
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+
+Test integers by string comparison.
+In this case detailed diff ist wanted.
+
+| Detailed Diff |
+| actual int | expected int? | #comment |
+| 1          | 1             | equal    |
+| 1          | 2             | completly different |
+| 1          | 10            | partially different |
+|            | 1             | completly different |
+
+Test integers by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
+In this case no detailed diff is wanted.
+
+| Detailed Diff |
+| actual int | expected int? | #comment |
+| 1          | >=1           | ok |
+| 1          | <2            | ok |
+| 1          | >1            | nok |
+| 1          | =1            | ok |
+| 1          | <1            | nok |
+| 1          | 0<_<2         | ok |
+| 1          | 2<_<0         | nok, logically wrong |
+| 1          | 0>_>2         | wrong syntax, disable value comparison, use string comparison |
+| 1          | 2>_>0         | wrong syntax, disable value comparison, use string comparison |
+-!|
+|test results for page|TestPage|should contain||
+*!
+
+!*> Tests for type double
+
+!| script |
+|given page|TestPage|with content|${SUT_PATH} !-
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+
+Test doubles by string comparison.
+In this case detailed diff ist wanted.
+
+| Detailed Diff |
+| actual double | expected double? | #comment |
+| 1.0           | 1.0              | equal    |
+| 1.1           | 222              | completly different |
+| 1.0           | 10               | partially different |
+|               | 1.0              | partially different |
+
+Test doubles by value comparison, see <FitNesse.UserGuide.WritingAcceptanceTests.SliM.ValueComparisons
+In this case no detailed diff is wanted.
+
+| Detailed Diff |
+| actual double | expected double? | #comment |
+| 1             | >=1              | ok |
+| 1             | <2               | ok |
+| 1             | >1               | nok |
+| 1             | =1               | ok |
+| 1             | <1               | nok |
+| 1             | 0<_<2            | ok |
+| 1             | 2<_<0            | nok, logically wrong |
+| 1             | 0>_>2            | wrong syntax, disable value comparison, use string comparison |
+| 1             | 2>_>0            | wrong syntax, disable value comparison, use string comparison |
+| 1.0           | ~=1              | ok |
+| 1.1           | ~=1              | ok |
+| 0.9           | ~=1              | ok |
+| 1.0           | ~=1.0            | ok |
+| 1.1           | ~=1.0            | nok |
+| 0.9           | ~=1.0            | nok |
+-!|
+|test results for page|TestPage|should contain||
+*!
+
+!*> Tests of fitnesse symbols
+
+!| script |
+|given page|TestPage|with content|${SUT_PATH} !-
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+Test symbols by string comparison.
+
+| Detailed Diff |
+| actual symbol | expected symbol? | #comment |
+| abc           | $symbol=         | |
+| $symbol       | abc              | |
+| $symbol       | xyz              | |
+| $symbol       | xbc              | |
+| $symbol       | ayc              | |
+| $symbol       | abz              | |
+| abc           | $symbol          | |
+| xyz           | $symbol          | |
+| xbc           | $symbol          | |
+| ayc           | $symbol          | |
+| abz           | $symbol          | |
+|               | $symbol          | |
+-!|
+|test results for page|TestPage|should contain|!-<span class="pass">abc</span>-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">abc</span>] <span class="fail">expected [</span><span class="diff">xyz</span><span class="fail">]</span>-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">a</span>bc] <span class="fail">expected [</span><span class="diff">x</span><span class="fail">bc]</span>-!|
+|test results for page|TestPage|should contain|!-[a<span class="diff">b</span>c] <span class="fail">expected [a</span><span class="diff">y</span><span class="fail">c]</span>-!|
+|test results for page|TestPage|should contain|!-[ab<span class="diff">c</span>] <span class="fail">expected [ab</span><span class="diff">z</span><span class="fail">]</span>-!|
+|test results for page|TestPage|should contain|!-&lt;span class="pass"&gt;$symbol-&gt;[abc]&lt;/span&gt;-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">xyz</span>] <span class="fail">expected [$symbol-&gt;[</span><span class="diff">abc</span><span class="fail">]]</span>-!|
+|test results for page|TestPage|should contain|!-[<span class="diff">x</span>bc] <span class="fail">expected [$symbol-&gt;[</span><span class="diff">a</span><span class="fail">bc]]</span>-!|
+|test results for page|TestPage|should contain|!-[a<span class="diff">y</span>c] <span class="fail">expected [$symbol-&gt;[a</span><span class="diff">b</span><span class="fail">c]]</span>-!|
+|test results for page|TestPage|should contain|!-[ab<span class="diff">z</span>] <span class="fail">expected [$symbol-&gt;[ab</span><span class="diff">c</span><span class="fail">]]</span>-!|
+|test results for page|TestPage|should contain|!-[] <span class="fail">expected [$symbol-&gt;[</span><span class="diff">abc</span><span class="fail">]]</span>-!|
+*!
+
+!*> Tests of custom comparator
+
+!| script |
+|given page|TestPage|with content|${SUT_PATH} !-
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile
+The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String).
+
+| script | Detailed Diff |
+| note  | everything not equals to 'abc' is ok |
+| check | echo | abc | inverse:xyz |
+| note  | everything not equals to 'abc' is ok |
+| check | echo | abc | inverse:ABC | 
+| note  | everthing not equals to 'abc' is ok |
+| check | echo | abc | inverse:cba | 
+| note  | only 'abc' is nok |
+| check | echo | abc | inverse:abc |
+-!|
+|test results for page|TestPage|should contain||
+*!
+
+!*> Tests of scenario
+
+!| script |
+|given page|TestPage|with content|${SUT_PATH} !-
+!define TEST_SYSTEM {slim}
+
+!| import |
+| fitnesse.slim.test |
+Test Scenario and Script
+
+!| Scenario | Detailed Diff Scenario Test |
+| start | Detailed Diff |
+| check | echo | hello | hello |
+| check | echo | hello | hallo |
+
+!| Script |
+| Detailed Diff Scenario Test |
+-!|
+|test results for page|TestPage|should contain|!-<span class="pass">hello</span>-!|
+|test results for page|TestPage|should contain|!-[h<span class="diff">e</span>llo] <span class="fail">expected [h</span><span class="diff">a</span><span class="fail">llo]</span>-!|
+*!
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml
index 6ca0af3..55bd9cd 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<properties>
-<Edit>true</Edit>
-<Files>true</Files>
-<Properties>true</Properties>
-<RecentChanges>true</RecentChanges>
-<Refactor>true</Refactor>
-<Search>true</Search>
-<Test>true</Test>
-<Versions>true</Versions>
-<WhereUsed>true</WhereUsed>
-</properties>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<properties>
+<Edit>true</Edit>
+<Files>true</Files>
+<Properties>true</Properties>
+<RecentChanges>true</RecentChanges>
+<Refactor>true</Refactor>
+<Search>true</Search>
+<Test>true</Test>
+<Versions>true</Versions>
+<WhereUsed>true</WhereUsed>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt
index d666fa1..ed204d1 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt
@@ -1,33 +1,33 @@
-|import            |
-|fitnesse.slim.test|
-
-
-There was a bug in the Scenario selection process that caused a scenario with no inputs to be selected when it should have been method on the driver class.  This happened because the !-ScenarioTable-! class was enhanced to try all rows as parameterized.  So it took "login" and tried "login _ ".  This resulted in the "login" scenario being used instead of the "loginWithUsernameAndPassword" method when "connect as with" scenario was called.  This page demonstrates the fix.
-
-
-!2 Scenario with no arguments and a shared root
-!|scenario |login |
-|connect to server|
-
-!2 
-!|scenario          |connect as|username    |with|password|
-|login with username|@username |and Password|@password    |
-
-
-!2 Scenario With one argument and a shared root.
-!|scenario           |login with|name|
-|connect to server as|@name          |
-
-
-!2 Now calling a scenario that does take arguments, but since it isn't in parameterized format, the scenario with an argument isn't called, even though it shares a common root.
-!|scenario          |connect as|username    |with|password|
-|login with username|@username |and Password|@password    |
-
-
-
-
-!|script                                 |
-|start     |Login Dialog Driver|bob |xyzz|
-|connect as|bob                |with|xyzz|
-
-
+|import            |
+|fitnesse.slim.test|
+
+
+There was a bug in the Scenario selection process that caused a scenario with no inputs to be selected when it should have been method on the driver class.  This happened because the !-ScenarioTable-! class was enhanced to try all rows as parameterized.  So it took "login" and tried "login _ ".  This resulted in the "login" scenario being used instead of the "loginWithUsernameAndPassword" method when "connect as with" scenario was called.  This page demonstrates the fix.
+
+
+!2 Scenario with no arguments and a shared root
+!|scenario |login |
+|connect to server|
+
+!2 
+!|scenario          |connect as|username    |with|password|
+|login with username|@username |and Password|@password    |
+
+
+!2 Scenario With one argument and a shared root.
+!|scenario           |login with|name|
+|connect to server as|@name          |
+
+
+!2 Now calling a scenario that does take arguments, but since it isn't in parameterized format, the scenario with an argument isn't called, even though it shares a common root.
+!|scenario          |connect as|username    |with|password|
+|login with username|@username |and Password|@password    |
+
+
+
+
+!|script                                 |
+|start     |Login Dialog Driver|bob |xyzz|
+|connect as|bob                |with|xyzz|
+
+
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml
index 4e908ad..e13fdf4 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Test>true</Test>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
+<?xml version="1.0"?>
+<properties>
+	<Edit>true</Edit>
+	<Files>true</Files>
+	<Properties>true</Properties>
+	<RecentChanges>true</RecentChanges>
+	<Refactor>true</Refactor>
+	<Search>true</Search>
+	<Test>true</Test>
+	<Versions>true</Versions>
+	<WhereUsed>true</WhereUsed>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt
index 0c1ff96..86d613f 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt
@@ -1,14 +1,14 @@
-Create an absolute symbolic link from a sub-page:
-
-First we need to create some pages to play with.
-!|Page creator.|
-|Page name.              |PageContents. |valid?|
-|LinkingPage             |LINKING PAGE  |true  |
-|LinkingPage.LinkingChild|LINKING CHILD |true  |
-|LinkedPage              |LINKED PAGE   |true  |
-|LinkedPage.LinkedChild  |LINKED CHILD  |true  |
-
-Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!.
-!|Response Requester.|
-|uri   |status?|
-|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath=.LinkedPage.LinkedChild|303|
+Create an absolute symbolic link from a sub-page:
+
+First we need to create some pages to play with.
+!|Page creator.|
+|Page name.              |PageContents. |valid?|
+|LinkingPage             |LINKING PAGE  |true  |
+|LinkingPage.LinkingChild|LINKING CHILD |true  |
+|LinkedPage              |LINKED PAGE   |true  |
+|LinkedPage.LinkedChild  |LINKED CHILD  |true  |
+
+Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!.
+!|Response Requester.|
+|uri   |status?|
+|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath=.LinkedPage.LinkedChild|303|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml
index 321f386..40a15d7 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<properties>
-  <Files/>
-  <Help></Help>
-  <LastModified>20071209231745</LastModified>
-  <RecentChanges/>
-  <Suites></Suites>
-  <saveId>1197255276583</saveId>
-  <ticketId>-2802271540647210678</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Files/>
+  <Help></Help>
+  <LastModified>20071209231745</LastModified>
+  <RecentChanges/>
+  <Suites></Suites>
+  <saveId>1197255276583</saveId>
+  <ticketId>-2802271540647210678</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt
index 236e215..46107f7 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt
@@ -1,13 +1,13 @@
-Create an absolute symbolic link from a sub-page:
-
-First we need to create some pages to play with.
-!|Page creator.|
-|Page name.              |PageContents. |valid?|
-|LinkingPage             |LINKING PAGE  |true  |
-|LinkingPage.LinkingChild|LINKING CHILD |true  |
-|LinkingPage.LinkedChild |LINKED CHILD  |true  |
-
-Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!.
-!|Response Requester.|
-|uri   |status?|
-|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath=<LinkingPage.LinkedChild|303|
+Create an absolute symbolic link from a sub-page:
+
+First we need to create some pages to play with.
+!|Page creator.|
+|Page name.              |PageContents. |valid?|
+|LinkingPage             |LINKING PAGE  |true  |
+|LinkingPage.LinkingChild|LINKING CHILD |true  |
+|LinkingPage.LinkedChild |LINKED CHILD  |true  |
+
+Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!.
+!|Response Requester.|
+|uri   |status?|
+|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath=<LinkingPage.LinkedChild|303|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/properties.xml
index a0e01bd..d300a13 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/properties.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<properties>
-  <Files/>
-  <Help></Help>
-  <LastModified>20071209231818</LastModified>
-  <RecentChanges/>
-  <Suites></Suites>
-  <saveId>1197255523311</saveId>
-  <ticketId>-2905294764201163185</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Files/>
+  <Help></Help>
+  <LastModified>20071209231818</LastModified>
+  <RecentChanges/>
+  <Suites></Suites>
+  <saveId>1197255523311</saveId>
+  <ticketId>-2905294764201163185</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt
index 0666d27..2c6e161 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt
@@ -1,15 +1,15 @@
-Create an nested backward symbolic link from a sub-page:
-
-First we need to create some pages to play with.
-!|Page creator.|
-|Page name.                                                       |PageContents.       |valid?|
-|LinkingPage                                                      |LINKING PAGE        |true  |
-|LinkingPage.LinkingChild                                         |LINKING CHILD       |true  |
-|LinkingPage.LinkingChild.LinkingGrandChild                       |LINKING GRAND CHILD |true  |
-|LinkingPage.LinkingChild.LinkingGrandChild.LinkingGreatGrandChild|LINKING GREAT GRAND CHILD |true  |
-|LinkingPage.LinkingChild.LinkedChild                             |LINKED CHILD        |true  |
-
-Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!.
-!|Response Requester.|
-|uri   |status?|
-|LinkingPage.LinkingChild.LinkingGrandChild.LinkingGreatGrandChild?responder=symlink&linkName=SymLink&linkPath=<LinkingChild.LinkedChild|303|
+Create an nested backward symbolic link from a sub-page:
+
+First we need to create some pages to play with.
+!|Page creator.|
+|Page name.                                                       |PageContents.       |valid?|
+|LinkingPage                                                      |LINKING PAGE        |true  |
+|LinkingPage.LinkingChild                                         |LINKING CHILD       |true  |
+|LinkingPage.LinkingChild.LinkingGrandChild                       |LINKING GRAND CHILD |true  |
+|LinkingPage.LinkingChild.LinkingGrandChild.LinkingGreatGrandChild|LINKING GREAT GRAND CHILD |true  |
+|LinkingPage.LinkingChild.LinkedChild                             |LINKED CHILD        |true  |
+
+Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!.
+!|Response Requester.|
+|uri   |status?|
+|LinkingPage.LinkingChild.LinkingGrandChild.LinkingGreatGrandChild?responder=symlink&linkName=SymLink&linkPath=<LinkingChild.LinkedChild|303|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/properties.xml
index c5e7ca0..b8c1f3b 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/properties.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<properties>
-  <Files/>
-  <Help></Help>
-  <LastModified>20071212153458</LastModified>
-  <RecentChanges/>
-  <Suites></Suites>
-  <saveId>1197318232254</saveId>
-  <ticketId>-6614712250920689672</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Files/>
+  <Help></Help>
+  <LastModified>20071212153458</LastModified>
+  <RecentChanges/>
+  <Suites></Suites>
+  <saveId>1197318232254</saveId>
+  <ticketId>-6614712250920689672</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt
index 78d3ef3..0db90fc 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt
@@ -1,15 +1,15 @@
-Creating a symbolic link is done in the properties view of the page that will contain the link.  There is a form where a user supplies a name for the link and a path for the linked page.  When submitted the URL has the following form:
-
-!-http://host/PathToPage?responder=symlink&linkName=<linkName>&linkPath=<linkPath>-!
-
-First we need to create some pages to play with.
-!|Page creator.|
-|Page name.|valid?|
-|LinkingPage|true|
-|LinkedPage|true|
-
-Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage-! as a child of !-LinkingPage-!.
-!|Response Requester.|
-|uri   |status?|
-|LinkingPage?responder=symlink&linkName=SymLink&linkPath=LinkedPage|303|
-
+Creating a symbolic link is done in the properties view of the page that will contain the link.  There is a form where a user supplies a name for the link and a path for the linked page.  When submitted the URL has the following form:
+
+!-http://host/PathToPage?responder=symlink&linkName=<linkName>&linkPath=<linkPath>-!
+
+First we need to create some pages to play with.
+!|Page creator.|
+|Page name.|valid?|
+|LinkingPage|true|
+|LinkedPage|true|
+
+Now we create a symbolic link named !-SymLink-!.  This links !-LinkedPage-! as a child of !-LinkingPage-!.
+!|Response Requester.|
+|uri   |status?|
+|LinkingPage?responder=symlink&linkName=SymLink&linkPath=LinkedPage|303|
+
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml
index cccf3d6..397f67b 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<properties>
-  <Files/>
-  <Help></Help>
-  <LastModified>20071209231838</LastModified>
-  <RecentChanges/>
-  <Suites></Suites>
-  <saveId>1197229524174</saveId>
-  <ticketId>5360217332855886973</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Files/>
+  <Help></Help>
+  <LastModified>20071209231838</LastModified>
+  <RecentChanges/>
+  <Suites></Suites>
+  <saveId>1197229524174</saveId>
+  <ticketId>5360217332855886973</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt
index 1dff5c4..7518a79 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt
@@ -1,12 +1,12 @@
-Create a symbolic link to a sub-page:
-
-First we need to create some pages to play with.
-!|Page creator.|
-|Page name.              |PageContents. |valid?|
-|LinkingPage             |LINKING PAGE  |true  |
-|LinkingPage.LinkedChild |LINKED CHILD  |true  |
-
-Now we create a symbolic link named !-SymLink-!.  This links !-LinkingPage.LinkedChild-! as a child of !-LinkingPage-!.
-!|Response Requester.|
-|uri   |status?|
-|LinkingPage?responder=symlink&linkName=SymLink&linkPath=>LinkedChild|303|
+Create a symbolic link to a sub-page:
+
+First we need to create some pages to play with.
+!|Page creator.|
+|Page name.              |PageContents. |valid?|
+|LinkingPage             |LINKING PAGE  |true  |
+|LinkingPage.LinkedChild |LINKED CHILD  |true  |
+
+Now we create a symbolic link named !-SymLink-!.  This links !-LinkingPage.LinkedChild-! as a child of !-LinkingPage-!.
+!|Response Requester.|
+|uri   |status?|
+|LinkingPage?responder=symlink&linkName=SymLink&linkPath=>LinkedChild|303|
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml
index 54faed6..c67bf59 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
-<properties>
-  <Edit>true</Edit>
-  <Files>true</Files>
-  <LastModified>20071209210332</LastModified>
-  <Properties>true</Properties>
-  <RecentChanges>true</RecentChanges>
-  <Refactor>true</Refactor>
-  <Search>true</Search>
-  <Versions>true</Versions>
-  <WhereUsed>true</WhereUsed>
-  <saveId>1197252212825</saveId>
-  <ticketId>6202123951021509855</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Edit>true</Edit>
+  <Files>true</Files>
+  <LastModified>20071209210332</LastModified>
+  <Properties>true</Properties>
+  <RecentChanges>true</RecentChanges>
+  <Refactor>true</Refactor>
+  <Search>true</Search>
+  <Versions>true</Versions>
+  <WhereUsed>true</WhereUsed>
+  <saveId>1197252212825</saveId>
+  <ticketId>6202123951021509855</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt
index 0f89b13..759f058 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt
@@ -1,14 +1,14 @@
-!c !3 Symbolic Links
-
-Symbolic Links allow a user to easily create parent-child links between pages without permanently affecting the wiki structure.  One common reason need for Symbolic Links is the the testing of a system on multiple environments.  For example, imagine an application that site on top of an Oracle database.  Hundreds of FitNesse tests have been written for this application using Oracle settings and then the team is confronted with the need to run the application on !-MySql-!.  Getting both databases running under the same suite of tests can be very difficult and may result in duplicating all the tests.  With Symbolic Links, the database configurations can be stored in high level pages along with appropriate path elements.  Then the high-level pages may symbolically link to the test suite.  In this manner one suite of tests can be executed in multiple environments.
-
-
->TestCreatingRelativeSymbolicLink
->TestCreatingAbsoluteSymbolicLink
->TestCreatingSubPageSymbolicLink
->TestCreatingBackwardSymbolicLink
->TestRemovingSymbolicLink
->TestSymbolicLinkBehavior
-----
-All Subpages:
+!c !3 Symbolic Links
+
+Symbolic Links allow a user to easily create parent-child links between pages without permanently affecting the wiki structure.  One common reason need for Symbolic Links is the the testing of a system on multiple environments.  For example, imagine an application that site on top of an Oracle database.  Hundreds of FitNesse tests have been written for this application using Oracle settings and then the team is confronted with the need to run the application on !-MySql-!.  Getting both databases running under the same suite of tests can be very difficult and may result in duplicating all the tests.  With Symbolic Links, the database configurations can be stored in high level pages along with appropriate path elements.  Then the high-level pages may symbolically link to the test suite.  In this manner one suite of tests can be executed in multiple environments.
+
+
+>TestCreatingRelativeSymbolicLink
+>TestCreatingAbsoluteSymbolicLink
+>TestCreatingSubPageSymbolicLink
+>TestCreatingBackwardSymbolicLink
+>TestRemovingSymbolicLink
+>TestSymbolicLinkBehavior
+----
+All Subpages:
 !contents
\ No newline at end of file
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml
index 3b4d24d..3c2058d 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
-<properties>
-  <Files/>
-  <Help/>
-  <LastModified>20071209232537</LastModified>
-  <RecentChanges/>
-  <Suite/>
-  <Suites/>
-  <WhereUsed/>
-  <saveId>1197260737340</saveId>
-  <ticketId>159061011507139978</ticketId>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Files/>
+  <Help/>
+  <LastModified>20071209232537</LastModified>
+  <RecentChanges/>
+  <Suite/>
+  <Suites/>
+  <WhereUsed/>
+  <saveId>1197260737340</saveId>
+  <ticketId>159061011507139978</ticketId>
+</properties>
diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml
index abb3da8..59a0a7c 100644
--- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml
+++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
-<properties>
-  <Files/>
-  <LastModified>20071130010014</LastModified>
-  <RecentChanges/>
-  <Suites></Suites>
-  <Test/>
-  <WhereUsed/>
-</properties>
+<?xml version="1.0"?>
+<properties>
+  <Files/>
+  <LastModified>20071130010014</LastModified>
+  <RecentChanges/>
+  <Suites></Suites>
+  <Test/>
+  <WhereUsed/>
+</properties>
diff --git a/pom.xml b/pom.xml
index 29af419..e13676f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
   <version>1.2.0</version>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
+    <sourceDirectory>src/main</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
 
     <resources>
       <resource>
@@ -20,7 +20,7 @@
 
     <testResources>
       <testResource>
-        <directory>test</directory>
+        <directory>src/test</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
@@ -83,7 +83,7 @@
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>main.LispMain</mainClass>
+                  <mainClass>application.LispMain</mainClass>
                 </transformer>
               </transformers>
             </configuration>
diff --git a/src/main/LispMain.java b/src/main/application/LispMain.java
similarity index 99%
rename from src/main/LispMain.java
rename to src/main/application/LispMain.java
index 837af64..91d8837 100644
--- a/src/main/LispMain.java
+++ b/src/main/application/LispMain.java
@@ -1,4 +1,4 @@
-package main;
+package application;
 
 import static com.googlecode.lanterna.terminal.IOSafeTerminalAdapter.createRuntimeExceptionConvertingAdapter;
 import static java.text.MessageFormat.format;
diff --git a/src/environment/RuntimeEnvironment.java b/src/main/environment/RuntimeEnvironment.java
similarity index 100%
rename from src/environment/RuntimeEnvironment.java
rename to src/main/environment/RuntimeEnvironment.java
diff --git a/src/error/CriticalLineColumnException.java b/src/main/error/CriticalLineColumnException.java
similarity index 100%
rename from src/error/CriticalLineColumnException.java
rename to src/main/error/CriticalLineColumnException.java
diff --git a/src/error/CriticalLispException.java b/src/main/error/CriticalLispException.java
similarity index 100%
rename from src/error/CriticalLispException.java
rename to src/main/error/CriticalLispException.java
diff --git a/src/error/ErrorManager.java b/src/main/error/ErrorManager.java
similarity index 100%
rename from src/error/ErrorManager.java
rename to src/main/error/ErrorManager.java
diff --git a/src/error/LineColumnException.java b/src/main/error/LineColumnException.java
similarity index 100%
rename from src/error/LineColumnException.java
rename to src/main/error/LineColumnException.java
diff --git a/src/error/LispException.java b/src/main/error/LispException.java
similarity index 100%
rename from src/error/LispException.java
rename to src/main/error/LispException.java
diff --git a/src/error/LispWarning.java b/src/main/error/LispWarning.java
similarity index 100%
rename from src/error/LispWarning.java
rename to src/main/error/LispWarning.java
diff --git a/src/file/FilePosition.java b/src/main/file/FilePosition.java
similarity index 100%
rename from src/file/FilePosition.java
rename to src/main/file/FilePosition.java
diff --git a/src/file/FilePositionTracker.java b/src/main/file/FilePositionTracker.java
similarity index 100%
rename from src/file/FilePositionTracker.java
rename to src/main/file/FilePositionTracker.java
diff --git a/src/function/ArgumentValidator.java b/src/main/function/ArgumentValidator.java
similarity index 100%
rename from src/function/ArgumentValidator.java
rename to src/main/function/ArgumentValidator.java
diff --git a/src/function/FunctionNames.java b/src/main/function/FunctionNames.java
similarity index 100%
rename from src/function/FunctionNames.java
rename to src/main/function/FunctionNames.java
diff --git a/src/function/LispFunction.java b/src/main/function/LispFunction.java
similarity index 100%
rename from src/function/LispFunction.java
rename to src/main/function/LispFunction.java
diff --git a/src/function/LispSpecialFunction.java b/src/main/function/LispSpecialFunction.java
similarity index 100%
rename from src/function/LispSpecialFunction.java
rename to src/main/function/LispSpecialFunction.java
diff --git a/src/function/UserDefinedFunction.java b/src/main/function/UserDefinedFunction.java
similarity index 100%
rename from src/function/UserDefinedFunction.java
rename to src/main/function/UserDefinedFunction.java
diff --git a/src/function/UserDefinedMacro.java b/src/main/function/UserDefinedMacro.java
similarity index 100%
rename from src/function/UserDefinedMacro.java
rename to src/main/function/UserDefinedMacro.java
diff --git a/src/function/UserDefinedSpecialFunction.java b/src/main/function/UserDefinedSpecialFunction.java
similarity index 100%
rename from src/function/UserDefinedSpecialFunction.java
rename to src/main/function/UserDefinedSpecialFunction.java
diff --git a/src/function/builtin/APPLY.java b/src/main/function/builtin/APPLY.java
similarity index 100%
rename from src/function/builtin/APPLY.java
rename to src/main/function/builtin/APPLY.java
diff --git a/src/function/builtin/BackquoteEvaluator.java b/src/main/function/builtin/BackquoteEvaluator.java
similarity index 100%
rename from src/function/builtin/BackquoteEvaluator.java
rename to src/main/function/builtin/BackquoteEvaluator.java
diff --git a/src/function/builtin/EVAL.java b/src/main/function/builtin/EVAL.java
similarity index 100%
rename from src/function/builtin/EVAL.java
rename to src/main/function/builtin/EVAL.java
diff --git a/src/function/builtin/EXIT.java b/src/main/function/builtin/EXIT.java
similarity index 100%
rename from src/function/builtin/EXIT.java
rename to src/main/function/builtin/EXIT.java
diff --git a/src/function/builtin/FUNCALL.java b/src/main/function/builtin/FUNCALL.java
similarity index 100%
rename from src/function/builtin/FUNCALL.java
rename to src/main/function/builtin/FUNCALL.java
diff --git a/src/function/builtin/FUSE.java b/src/main/function/builtin/FUSE.java
similarity index 100%
rename from src/function/builtin/FUSE.java
rename to src/main/function/builtin/FUSE.java
diff --git a/src/function/builtin/GENSYM.java b/src/main/function/builtin/GENSYM.java
similarity index 100%
rename from src/function/builtin/GENSYM.java
rename to src/main/function/builtin/GENSYM.java
diff --git a/src/function/builtin/LOAD.java b/src/main/function/builtin/LOAD.java
similarity index 100%
rename from src/function/builtin/LOAD.java
rename to src/main/function/builtin/LOAD.java
diff --git a/src/function/builtin/PRINT.java b/src/main/function/builtin/PRINT.java
similarity index 100%
rename from src/function/builtin/PRINT.java
rename to src/main/function/builtin/PRINT.java
diff --git a/src/function/builtin/SET.java b/src/main/function/builtin/SET.java
similarity index 100%
rename from src/function/builtin/SET.java
rename to src/main/function/builtin/SET.java
diff --git a/src/function/builtin/SYMBOLS.java b/src/main/function/builtin/SYMBOLS.java
similarity index 100%
rename from src/function/builtin/SYMBOLS.java
rename to src/main/function/builtin/SYMBOLS.java
diff --git a/src/function/builtin/SYMBOL_FUNCTION.java b/src/main/function/builtin/SYMBOL_FUNCTION.java
similarity index 100%
rename from src/function/builtin/SYMBOL_FUNCTION.java
rename to src/main/function/builtin/SYMBOL_FUNCTION.java
diff --git a/src/function/builtin/cons/APPEND.java b/src/main/function/builtin/cons/APPEND.java
similarity index 100%
rename from src/function/builtin/cons/APPEND.java
rename to src/main/function/builtin/cons/APPEND.java
diff --git a/src/function/builtin/cons/CONS.java b/src/main/function/builtin/cons/CONS.java
similarity index 100%
rename from src/function/builtin/cons/CONS.java
rename to src/main/function/builtin/cons/CONS.java
diff --git a/src/function/builtin/cons/FIRST.java b/src/main/function/builtin/cons/FIRST.java
similarity index 100%
rename from src/function/builtin/cons/FIRST.java
rename to src/main/function/builtin/cons/FIRST.java
diff --git a/src/function/builtin/cons/LENGTH.java b/src/main/function/builtin/cons/LENGTH.java
similarity index 100%
rename from src/function/builtin/cons/LENGTH.java
rename to src/main/function/builtin/cons/LENGTH.java
diff --git a/src/function/builtin/cons/LIST.java b/src/main/function/builtin/cons/LIST.java
similarity index 100%
rename from src/function/builtin/cons/LIST.java
rename to src/main/function/builtin/cons/LIST.java
diff --git a/src/function/builtin/cons/REST.java b/src/main/function/builtin/cons/REST.java
similarity index 100%
rename from src/function/builtin/cons/REST.java
rename to src/main/function/builtin/cons/REST.java
diff --git a/src/function/builtin/math/DIVIDE.java b/src/main/function/builtin/math/DIVIDE.java
similarity index 100%
rename from src/function/builtin/math/DIVIDE.java
rename to src/main/function/builtin/math/DIVIDE.java
diff --git a/src/function/builtin/math/MINUS.java b/src/main/function/builtin/math/MINUS.java
similarity index 100%
rename from src/function/builtin/math/MINUS.java
rename to src/main/function/builtin/math/MINUS.java
diff --git a/src/function/builtin/math/MODULO.java b/src/main/function/builtin/math/MODULO.java
similarity index 100%
rename from src/function/builtin/math/MODULO.java
rename to src/main/function/builtin/math/MODULO.java
diff --git a/src/function/builtin/math/MULTIPLY.java b/src/main/function/builtin/math/MULTIPLY.java
similarity index 100%
rename from src/function/builtin/math/MULTIPLY.java
rename to src/main/function/builtin/math/MULTIPLY.java
diff --git a/src/function/builtin/math/MathFunction.java b/src/main/function/builtin/math/MathFunction.java
similarity index 100%
rename from src/function/builtin/math/MathFunction.java
rename to src/main/function/builtin/math/MathFunction.java
diff --git a/src/function/builtin/math/PLUS.java b/src/main/function/builtin/math/PLUS.java
similarity index 100%
rename from src/function/builtin/math/PLUS.java
rename to src/main/function/builtin/math/PLUS.java
diff --git a/src/function/builtin/math/REMAINDER.java b/src/main/function/builtin/math/REMAINDER.java
similarity index 100%
rename from src/function/builtin/math/REMAINDER.java
rename to src/main/function/builtin/math/REMAINDER.java
diff --git a/src/function/builtin/predicate/ATOM.java b/src/main/function/builtin/predicate/ATOM.java
similarity index 100%
rename from src/function/builtin/predicate/ATOM.java
rename to src/main/function/builtin/predicate/ATOM.java
diff --git a/src/function/builtin/predicate/EQ.java b/src/main/function/builtin/predicate/EQ.java
similarity index 100%
rename from src/function/builtin/predicate/EQ.java
rename to src/main/function/builtin/predicate/EQ.java
diff --git a/src/function/builtin/predicate/EQUAL.java b/src/main/function/builtin/predicate/EQUAL.java
similarity index 100%
rename from src/function/builtin/predicate/EQUAL.java
rename to src/main/function/builtin/predicate/EQUAL.java
diff --git a/src/function/builtin/predicate/GENSYM_EQUAL.java b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
similarity index 100%
rename from src/function/builtin/predicate/GENSYM_EQUAL.java
rename to src/main/function/builtin/predicate/GENSYM_EQUAL.java
diff --git a/src/function/builtin/predicate/LISTP.java b/src/main/function/builtin/predicate/LISTP.java
similarity index 100%
rename from src/function/builtin/predicate/LISTP.java
rename to src/main/function/builtin/predicate/LISTP.java
diff --git a/src/function/builtin/predicate/NULL.java b/src/main/function/builtin/predicate/NULL.java
similarity index 100%
rename from src/function/builtin/predicate/NULL.java
rename to src/main/function/builtin/predicate/NULL.java
diff --git a/src/function/builtin/predicate/NUMERIC_EQUAL.java b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
similarity index 100%
rename from src/function/builtin/predicate/NUMERIC_EQUAL.java
rename to src/main/function/builtin/predicate/NUMERIC_EQUAL.java
diff --git a/src/function/builtin/predicate/NUMERIC_GREATER.java b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
similarity index 100%
rename from src/function/builtin/predicate/NUMERIC_GREATER.java
rename to src/main/function/builtin/predicate/NUMERIC_GREATER.java
diff --git a/src/function/builtin/predicate/NUMERIC_LESS.java b/src/main/function/builtin/predicate/NUMERIC_LESS.java
similarity index 100%
rename from src/function/builtin/predicate/NUMERIC_LESS.java
rename to src/main/function/builtin/predicate/NUMERIC_LESS.java
diff --git a/src/function/builtin/special/AND.java b/src/main/function/builtin/special/AND.java
similarity index 100%
rename from src/function/builtin/special/AND.java
rename to src/main/function/builtin/special/AND.java
diff --git a/src/function/builtin/special/CASE.java b/src/main/function/builtin/special/CASE.java
similarity index 100%
rename from src/function/builtin/special/CASE.java
rename to src/main/function/builtin/special/CASE.java
diff --git a/src/function/builtin/special/COND.java b/src/main/function/builtin/special/COND.java
similarity index 100%
rename from src/function/builtin/special/COND.java
rename to src/main/function/builtin/special/COND.java
diff --git a/src/function/builtin/special/DEFINE_SPECIAL.java b/src/main/function/builtin/special/DEFINE_SPECIAL.java
similarity index 100%
rename from src/function/builtin/special/DEFINE_SPECIAL.java
rename to src/main/function/builtin/special/DEFINE_SPECIAL.java
diff --git a/src/function/builtin/special/DEFMACRO.java b/src/main/function/builtin/special/DEFMACRO.java
similarity index 100%
rename from src/function/builtin/special/DEFMACRO.java
rename to src/main/function/builtin/special/DEFMACRO.java
diff --git a/src/function/builtin/special/DEFUN.java b/src/main/function/builtin/special/DEFUN.java
similarity index 100%
rename from src/function/builtin/special/DEFUN.java
rename to src/main/function/builtin/special/DEFUN.java
diff --git a/src/function/builtin/special/Define.java b/src/main/function/builtin/special/Define.java
similarity index 100%
rename from src/function/builtin/special/Define.java
rename to src/main/function/builtin/special/Define.java
diff --git a/src/function/builtin/special/IF.java b/src/main/function/builtin/special/IF.java
similarity index 100%
rename from src/function/builtin/special/IF.java
rename to src/main/function/builtin/special/IF.java
diff --git a/src/function/builtin/special/LAMBDA.java b/src/main/function/builtin/special/LAMBDA.java
similarity index 100%
rename from src/function/builtin/special/LAMBDA.java
rename to src/main/function/builtin/special/LAMBDA.java
diff --git a/src/function/builtin/special/LET.java b/src/main/function/builtin/special/LET.java
similarity index 100%
rename from src/function/builtin/special/LET.java
rename to src/main/function/builtin/special/LET.java
diff --git a/src/function/builtin/special/LET_STAR.java b/src/main/function/builtin/special/LET_STAR.java
similarity index 100%
rename from src/function/builtin/special/LET_STAR.java
rename to src/main/function/builtin/special/LET_STAR.java
diff --git a/src/function/builtin/special/OR.java b/src/main/function/builtin/special/OR.java
similarity index 100%
rename from src/function/builtin/special/OR.java
rename to src/main/function/builtin/special/OR.java
diff --git a/src/function/builtin/special/PROGN.java b/src/main/function/builtin/special/PROGN.java
similarity index 100%
rename from src/function/builtin/special/PROGN.java
rename to src/main/function/builtin/special/PROGN.java
diff --git a/src/function/builtin/special/QUOTE.java b/src/main/function/builtin/special/QUOTE.java
similarity index 100%
rename from src/function/builtin/special/QUOTE.java
rename to src/main/function/builtin/special/QUOTE.java
diff --git a/src/function/builtin/special/RECUR.java b/src/main/function/builtin/special/RECUR.java
similarity index 100%
rename from src/function/builtin/special/RECUR.java
rename to src/main/function/builtin/special/RECUR.java
diff --git a/src/function/builtin/special/SETQ.java b/src/main/function/builtin/special/SETQ.java
similarity index 100%
rename from src/function/builtin/special/SETQ.java
rename to src/main/function/builtin/special/SETQ.java
diff --git a/src/interpreter/FileLispInterpreter.java b/src/main/interpreter/FileLispInterpreter.java
similarity index 100%
rename from src/interpreter/FileLispInterpreter.java
rename to src/main/interpreter/FileLispInterpreter.java
diff --git a/src/interpreter/InteractiveLispInterpreter.java b/src/main/interpreter/InteractiveLispInterpreter.java
similarity index 100%
rename from src/interpreter/InteractiveLispInterpreter.java
rename to src/main/interpreter/InteractiveLispInterpreter.java
diff --git a/src/interpreter/LispInterpreter.java b/src/main/interpreter/LispInterpreter.java
similarity index 100%
rename from src/interpreter/LispInterpreter.java
rename to src/main/interpreter/LispInterpreter.java
diff --git a/src/interpreter/LispInterpreterBuilder.java b/src/main/interpreter/LispInterpreterBuilder.java
similarity index 100%
rename from src/interpreter/LispInterpreterBuilder.java
rename to src/main/interpreter/LispInterpreterBuilder.java
diff --git a/src/interpreter/LispInterpreterBuilderImpl.java b/src/main/interpreter/LispInterpreterBuilderImpl.java
similarity index 100%
rename from src/interpreter/LispInterpreterBuilderImpl.java
rename to src/main/interpreter/LispInterpreterBuilderImpl.java
diff --git a/src/parser/LispParser.java b/src/main/parser/LispParser.java
similarity index 100%
rename from src/parser/LispParser.java
rename to src/main/parser/LispParser.java
diff --git a/src/recursion/TailCall.java b/src/main/recursion/TailCall.java
similarity index 100%
rename from src/recursion/TailCall.java
rename to src/main/recursion/TailCall.java
diff --git a/src/recursion/TailCalls.java b/src/main/recursion/TailCalls.java
similarity index 100%
rename from src/recursion/TailCalls.java
rename to src/main/recursion/TailCalls.java
diff --git a/src/scanner/LispCommentRemovingInputStream.java b/src/main/scanner/LispCommentRemovingInputStream.java
similarity index 100%
rename from src/scanner/LispCommentRemovingInputStream.java
rename to src/main/scanner/LispCommentRemovingInputStream.java
diff --git a/src/scanner/LispInputStream.java b/src/main/scanner/LispInputStream.java
similarity index 100%
rename from src/scanner/LispInputStream.java
rename to src/main/scanner/LispInputStream.java
diff --git a/src/scanner/LispScanner.java b/src/main/scanner/LispScanner.java
similarity index 100%
rename from src/scanner/LispScanner.java
rename to src/main/scanner/LispScanner.java
diff --git a/src/sexpression/AtSignExpression.java b/src/main/sexpression/AtSignExpression.java
similarity index 100%
rename from src/sexpression/AtSignExpression.java
rename to src/main/sexpression/AtSignExpression.java
diff --git a/src/sexpression/Atom.java b/src/main/sexpression/Atom.java
similarity index 100%
rename from src/sexpression/Atom.java
rename to src/main/sexpression/Atom.java
diff --git a/src/sexpression/BackquoteExpression.java b/src/main/sexpression/BackquoteExpression.java
similarity index 100%
rename from src/sexpression/BackquoteExpression.java
rename to src/main/sexpression/BackquoteExpression.java
diff --git a/src/sexpression/CommaExpression.java b/src/main/sexpression/CommaExpression.java
similarity index 100%
rename from src/sexpression/CommaExpression.java
rename to src/main/sexpression/CommaExpression.java
diff --git a/src/sexpression/Cons.java b/src/main/sexpression/Cons.java
similarity index 100%
rename from src/sexpression/Cons.java
rename to src/main/sexpression/Cons.java
diff --git a/src/sexpression/DisplayName.java b/src/main/sexpression/DisplayName.java
similarity index 100%
rename from src/sexpression/DisplayName.java
rename to src/main/sexpression/DisplayName.java
diff --git a/src/sexpression/LambdaExpression.java b/src/main/sexpression/LambdaExpression.java
similarity index 100%
rename from src/sexpression/LambdaExpression.java
rename to src/main/sexpression/LambdaExpression.java
diff --git a/src/sexpression/LispNumber.java b/src/main/sexpression/LispNumber.java
similarity index 100%
rename from src/sexpression/LispNumber.java
rename to src/main/sexpression/LispNumber.java
diff --git a/src/sexpression/LispString.java b/src/main/sexpression/LispString.java
similarity index 100%
rename from src/sexpression/LispString.java
rename to src/main/sexpression/LispString.java
diff --git a/src/sexpression/Nil.java b/src/main/sexpression/Nil.java
similarity index 100%
rename from src/sexpression/Nil.java
rename to src/main/sexpression/Nil.java
diff --git a/src/sexpression/SExpression.java b/src/main/sexpression/SExpression.java
similarity index 100%
rename from src/sexpression/SExpression.java
rename to src/main/sexpression/SExpression.java
diff --git a/src/sexpression/Symbol.java b/src/main/sexpression/Symbol.java
similarity index 100%
rename from src/sexpression/Symbol.java
rename to src/main/sexpression/Symbol.java
diff --git a/src/stream/SafeInputStream.java b/src/main/stream/SafeInputStream.java
similarity index 100%
rename from src/stream/SafeInputStream.java
rename to src/main/stream/SafeInputStream.java
diff --git a/src/stream/SafeOutputStream.java b/src/main/stream/SafeOutputStream.java
similarity index 100%
rename from src/stream/SafeOutputStream.java
rename to src/main/stream/SafeOutputStream.java
diff --git a/src/stream/UncheckedIOException.java b/src/main/stream/UncheckedIOException.java
similarity index 100%
rename from src/stream/UncheckedIOException.java
rename to src/main/stream/UncheckedIOException.java
diff --git a/src/table/ExecutionContext.java b/src/main/table/ExecutionContext.java
similarity index 100%
rename from src/table/ExecutionContext.java
rename to src/main/table/ExecutionContext.java
diff --git a/src/table/FunctionTable.java b/src/main/table/FunctionTable.java
similarity index 100%
rename from src/table/FunctionTable.java
rename to src/main/table/FunctionTable.java
diff --git a/src/table/SymbolTable.java b/src/main/table/SymbolTable.java
similarity index 100%
rename from src/table/SymbolTable.java
rename to src/main/table/SymbolTable.java
diff --git a/src/terminal/ControlSequence.java b/src/main/terminal/ControlSequence.java
similarity index 100%
rename from src/terminal/ControlSequence.java
rename to src/main/terminal/ControlSequence.java
diff --git a/src/terminal/ControlSequenceHandler.java b/src/main/terminal/ControlSequenceHandler.java
similarity index 100%
rename from src/terminal/ControlSequenceHandler.java
rename to src/main/terminal/ControlSequenceHandler.java
diff --git a/src/terminal/ControlSequenceLookup.java b/src/main/terminal/ControlSequenceLookup.java
similarity index 100%
rename from src/terminal/ControlSequenceLookup.java
rename to src/main/terminal/ControlSequenceLookup.java
diff --git a/src/terminal/LispTerminal.java b/src/main/terminal/LispTerminal.java
similarity index 100%
rename from src/terminal/LispTerminal.java
rename to src/main/terminal/LispTerminal.java
diff --git a/src/terminal/SelectGraphicRendition.java b/src/main/terminal/SelectGraphicRendition.java
similarity index 100%
rename from src/terminal/SelectGraphicRendition.java
rename to src/main/terminal/SelectGraphicRendition.java
diff --git a/src/terminal/TerminalConfiguration.java b/src/main/terminal/TerminalConfiguration.java
similarity index 100%
rename from src/terminal/TerminalConfiguration.java
rename to src/main/terminal/TerminalConfiguration.java
diff --git a/src/terminal/TerminalHistory.java b/src/main/terminal/TerminalHistory.java
similarity index 100%
rename from src/terminal/TerminalHistory.java
rename to src/main/terminal/TerminalHistory.java
diff --git a/src/token/AtSign.java b/src/main/token/AtSign.java
similarity index 100%
rename from src/token/AtSign.java
rename to src/main/token/AtSign.java
diff --git a/src/token/Backquote.java b/src/main/token/Backquote.java
similarity index 100%
rename from src/token/Backquote.java
rename to src/main/token/Backquote.java
diff --git a/src/token/Comma.java b/src/main/token/Comma.java
similarity index 100%
rename from src/token/Comma.java
rename to src/main/token/Comma.java
diff --git a/src/token/Eof.java b/src/main/token/Eof.java
similarity index 100%
rename from src/token/Eof.java
rename to src/main/token/Eof.java
diff --git a/src/token/Identifier.java b/src/main/token/Identifier.java
similarity index 100%
rename from src/token/Identifier.java
rename to src/main/token/Identifier.java
diff --git a/src/token/LeftParenthesis.java b/src/main/token/LeftParenthesis.java
similarity index 100%
rename from src/token/LeftParenthesis.java
rename to src/main/token/LeftParenthesis.java
diff --git a/src/token/Number.java b/src/main/token/Number.java
similarity index 100%
rename from src/token/Number.java
rename to src/main/token/Number.java
diff --git a/src/token/QuoteMark.java b/src/main/token/QuoteMark.java
similarity index 100%
rename from src/token/QuoteMark.java
rename to src/main/token/QuoteMark.java
diff --git a/src/token/QuotedString.java b/src/main/token/QuotedString.java
similarity index 100%
rename from src/token/QuotedString.java
rename to src/main/token/QuotedString.java
diff --git a/src/token/RightParenthesis.java b/src/main/token/RightParenthesis.java
similarity index 100%
rename from src/token/RightParenthesis.java
rename to src/main/token/RightParenthesis.java
diff --git a/src/token/Token.java b/src/main/token/Token.java
similarity index 100%
rename from src/token/Token.java
rename to src/main/token/Token.java
diff --git a/src/token/TokenFactory.java b/src/main/token/TokenFactory.java
similarity index 100%
rename from src/token/TokenFactory.java
rename to src/main/token/TokenFactory.java
diff --git a/src/token/TokenFactoryImpl.java b/src/main/token/TokenFactoryImpl.java
similarity index 100%
rename from src/token/TokenFactoryImpl.java
rename to src/main/token/TokenFactoryImpl.java
diff --git a/src/util/Characters.java b/src/main/util/Characters.java
similarity index 100%
rename from src/util/Characters.java
rename to src/main/util/Characters.java
diff --git a/src/util/Path.java b/src/main/util/Path.java
similarity index 100%
rename from src/util/Path.java
rename to src/main/util/Path.java
diff --git a/test/acceptance/AcceptanceTest.java b/src/test/acceptance/AcceptanceTest.java
similarity index 100%
rename from test/acceptance/AcceptanceTest.java
rename to src/test/acceptance/AcceptanceTest.java
diff --git a/test/acceptance/fixture/LispInterpreterFixture.java b/src/test/acceptance/fixture/LispInterpreterFixture.java
similarity index 97%
rename from test/acceptance/fixture/LispInterpreterFixture.java
rename to src/test/acceptance/fixture/LispInterpreterFixture.java
index c476c5a..622f6a3 100644
--- a/test/acceptance/fixture/LispInterpreterFixture.java
+++ b/src/test/acceptance/fixture/LispInterpreterFixture.java
@@ -1,6 +1,6 @@
 package acceptance.fixture;
 
-import static main.LispMain.LANGUAGE_FILE_NAMES;
+import static application.LispMain.LANGUAGE_FILE_NAMES;
 import static table.FunctionTable.resetFunctionTable;
 import static util.Path.getPathPrefix;
 
diff --git a/test/main/MainTest.java b/src/test/application/MainTest.java
similarity index 88%
rename from test/main/MainTest.java
rename to src/test/application/MainTest.java
index 8c89602..f385856 100644
--- a/test/main/MainTest.java
+++ b/src/test/application/MainTest.java
@@ -1,11 +1,11 @@
-package main;
+package application;
 
 import static com.googlecode.lanterna.input.KeyType.Enter;
 import static java.text.MessageFormat.format;
-import static main.LispMain.ANSI_GREEN;
-import static main.LispMain.ANSI_PURPLE;
-import static main.LispMain.ANSI_RESET;
-import static main.LispMain.GREETING;
+import static application.LispMain.ANSI_GREEN;
+import static application.LispMain.ANSI_PURPLE;
+import static application.LispMain.ANSI_RESET;
+import static application.LispMain.GREETING;
 import static org.junit.Assert.assertEquals;
 
 import java.io.PipedInputStream;
@@ -100,7 +100,7 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void runWithBadFile() {
-        String expectedMessage = "[critical] test/main/test-files/bad.lisp (No such file or directory)";
+        String expectedMessage = "[critical] src/test/application/test-files/bad.lisp (No such file or directory)";
 
         exit.expectSystemExitWithStatus(1);
         exit.checkAssertionAfterwards(() -> {
@@ -109,12 +109,12 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
         });
 
-        runInterpreterWithFile("test/main/test-files/bad.lisp");
+        runInterpreterWithFile("src/test/application/test-files/bad.lisp");
     }
 
     @Test
     public void runWithFile_PrintsDecoratedLastValueOnly() {
-        runInterpreterWithFile("test/main/test-files/file.lisp");
+        runInterpreterWithFile("src/test/application/test-files/file.lisp");
 
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
@@ -138,7 +138,7 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void runMain() {
-        LispMain.main(new String[] { "test/main/test-files/file.lisp" });
+        LispMain.main(new String[] { "src/test/application/test-files/file.lisp" });
 
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
diff --git a/test/main/test-files/file.lisp b/src/test/application/test-files/file.lisp
similarity index 100%
rename from test/main/test-files/file.lisp
rename to src/test/application/test-files/file.lisp
diff --git a/test/environment/RuntimeEnvironmentTest.java b/src/test/environment/RuntimeEnvironmentTest.java
similarity index 100%
rename from test/environment/RuntimeEnvironmentTest.java
rename to src/test/environment/RuntimeEnvironmentTest.java
diff --git a/test/error/ErrorManagerTest.java b/src/test/error/ErrorManagerTest.java
similarity index 100%
rename from test/error/ErrorManagerTest.java
rename to src/test/error/ErrorManagerTest.java
diff --git a/test/file/FilePositionTrackerTest.java b/src/test/file/FilePositionTrackerTest.java
similarity index 100%
rename from test/file/FilePositionTrackerTest.java
rename to src/test/file/FilePositionTrackerTest.java
diff --git a/test/function/ArgumentValidatorTest.java b/src/test/function/ArgumentValidatorTest.java
similarity index 100%
rename from test/function/ArgumentValidatorTest.java
rename to src/test/function/ArgumentValidatorTest.java
diff --git a/test/function/LispFunctionTest.java b/src/test/function/LispFunctionTest.java
similarity index 100%
rename from test/function/LispFunctionTest.java
rename to src/test/function/LispFunctionTest.java
diff --git a/test/function/LispSpecialFunctionTest.java b/src/test/function/LispSpecialFunctionTest.java
similarity index 100%
rename from test/function/LispSpecialFunctionTest.java
rename to src/test/function/LispSpecialFunctionTest.java
diff --git a/test/function/UserDefinedFunctionTest.java b/src/test/function/UserDefinedFunctionTest.java
similarity index 100%
rename from test/function/UserDefinedFunctionTest.java
rename to src/test/function/UserDefinedFunctionTest.java
diff --git a/test/function/builtin/APPLYTest.java b/src/test/function/builtin/APPLYTest.java
similarity index 100%
rename from test/function/builtin/APPLYTest.java
rename to src/test/function/builtin/APPLYTest.java
diff --git a/test/function/builtin/BackquoteEvaluatorTest.java b/src/test/function/builtin/BackquoteEvaluatorTest.java
similarity index 100%
rename from test/function/builtin/BackquoteEvaluatorTest.java
rename to src/test/function/builtin/BackquoteEvaluatorTest.java
diff --git a/test/function/builtin/EVALTest.java b/src/test/function/builtin/EVALTest.java
similarity index 100%
rename from test/function/builtin/EVALTest.java
rename to src/test/function/builtin/EVALTest.java
diff --git a/test/function/builtin/EXITTest.java b/src/test/function/builtin/EXITTest.java
similarity index 100%
rename from test/function/builtin/EXITTest.java
rename to src/test/function/builtin/EXITTest.java
diff --git a/test/function/builtin/FUNCALLTest.java b/src/test/function/builtin/FUNCALLTest.java
similarity index 100%
rename from test/function/builtin/FUNCALLTest.java
rename to src/test/function/builtin/FUNCALLTest.java
diff --git a/test/function/builtin/GENSYMTest.java b/src/test/function/builtin/GENSYMTest.java
similarity index 100%
rename from test/function/builtin/GENSYMTest.java
rename to src/test/function/builtin/GENSYMTest.java
diff --git a/test/function/builtin/LOADTest.java b/src/test/function/builtin/LOADTest.java
similarity index 89%
rename from test/function/builtin/LOADTest.java
rename to src/test/function/builtin/LOADTest.java
index 5b7bf31..a393004 100644
--- a/test/function/builtin/LOADTest.java
+++ b/src/test/function/builtin/LOADTest.java
@@ -71,7 +71,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadGoodFile_ReturnsTAndPrintsNothing() {
-        String input = "(load \"test/function/builtin/test-files/load-good.lisp\")";
+        String input = "(load \"src/test/function/builtin/test-files/load-good.lisp\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -79,7 +79,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadBadFile_ReturnsNilAndPrintsError() {
-        String input = "(load \"test/function/builtin/test-files/load-bad.lisp\")";
+        String input = "(load \"src/test/function/builtin/test-files/load-bad.lisp\")";
 
         assertNil(evaluateString(input));
         assertErrorMessagePrinted();
@@ -95,7 +95,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void nestedLoadsInTheSameDirectory() {
-        String input = "(load \"test/function/builtin/test-files/nested/nested.lisp\")";
+        String input = "(load \"src/test/function/builtin/test-files/nested/nested.lisp\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -103,7 +103,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void nestedLoadsInDifferentDirectories() {
-        String input = "(load \"test/function/builtin/test-files/nested/one/load-one.lisp\")";
+        String input = "(load \"src/test/function/builtin/test-files/nested/one/load-one.lisp\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -126,7 +126,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadUsesRuntimePath() {
-        environment.setPath("test/function/builtin/test-files/nested/one/");
+        environment.setPath("src/test/function/builtin/test-files/nested/one/");
         String input = "(load \"load-one.lisp\")";
 
         assertT(evaluateString(input));
diff --git a/test/function/builtin/PRINTTest.java b/src/test/function/builtin/PRINTTest.java
similarity index 100%
rename from test/function/builtin/PRINTTest.java
rename to src/test/function/builtin/PRINTTest.java
diff --git a/test/function/builtin/SETTest.java b/src/test/function/builtin/SETTest.java
similarity index 100%
rename from test/function/builtin/SETTest.java
rename to src/test/function/builtin/SETTest.java
diff --git a/test/function/builtin/SYMBOLSTest.java b/src/test/function/builtin/SYMBOLSTest.java
similarity index 100%
rename from test/function/builtin/SYMBOLSTest.java
rename to src/test/function/builtin/SYMBOLSTest.java
diff --git a/test/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
similarity index 100%
rename from test/function/builtin/SYMBOL_FUNCTIONTest.java
rename to src/test/function/builtin/SYMBOL_FUNCTIONTest.java
diff --git a/test/function/builtin/cons/APPENDTest.java b/src/test/function/builtin/cons/APPENDTest.java
similarity index 100%
rename from test/function/builtin/cons/APPENDTest.java
rename to src/test/function/builtin/cons/APPENDTest.java
diff --git a/test/function/builtin/cons/CONSTest.java b/src/test/function/builtin/cons/CONSTest.java
similarity index 100%
rename from test/function/builtin/cons/CONSTest.java
rename to src/test/function/builtin/cons/CONSTest.java
diff --git a/test/function/builtin/cons/FIRSTTest.java b/src/test/function/builtin/cons/FIRSTTest.java
similarity index 100%
rename from test/function/builtin/cons/FIRSTTest.java
rename to src/test/function/builtin/cons/FIRSTTest.java
diff --git a/test/function/builtin/cons/LENGTHTest.java b/src/test/function/builtin/cons/LENGTHTest.java
similarity index 100%
rename from test/function/builtin/cons/LENGTHTest.java
rename to src/test/function/builtin/cons/LENGTHTest.java
diff --git a/test/function/builtin/cons/LISTTest.java b/src/test/function/builtin/cons/LISTTest.java
similarity index 100%
rename from test/function/builtin/cons/LISTTest.java
rename to src/test/function/builtin/cons/LISTTest.java
diff --git a/test/function/builtin/cons/RESTTest.java b/src/test/function/builtin/cons/RESTTest.java
similarity index 100%
rename from test/function/builtin/cons/RESTTest.java
rename to src/test/function/builtin/cons/RESTTest.java
diff --git a/test/function/builtin/math/DIVIDETest.java b/src/test/function/builtin/math/DIVIDETest.java
similarity index 100%
rename from test/function/builtin/math/DIVIDETest.java
rename to src/test/function/builtin/math/DIVIDETest.java
diff --git a/test/function/builtin/math/MINUSTest.java b/src/test/function/builtin/math/MINUSTest.java
similarity index 100%
rename from test/function/builtin/math/MINUSTest.java
rename to src/test/function/builtin/math/MINUSTest.java
diff --git a/test/function/builtin/math/MODULOTest.java b/src/test/function/builtin/math/MODULOTest.java
similarity index 100%
rename from test/function/builtin/math/MODULOTest.java
rename to src/test/function/builtin/math/MODULOTest.java
diff --git a/test/function/builtin/math/MULTIPLYTest.java b/src/test/function/builtin/math/MULTIPLYTest.java
similarity index 100%
rename from test/function/builtin/math/MULTIPLYTest.java
rename to src/test/function/builtin/math/MULTIPLYTest.java
diff --git a/test/function/builtin/math/PLUSTest.java b/src/test/function/builtin/math/PLUSTest.java
similarity index 100%
rename from test/function/builtin/math/PLUSTest.java
rename to src/test/function/builtin/math/PLUSTest.java
diff --git a/test/function/builtin/math/REMAINDERTest.java b/src/test/function/builtin/math/REMAINDERTest.java
similarity index 100%
rename from test/function/builtin/math/REMAINDERTest.java
rename to src/test/function/builtin/math/REMAINDERTest.java
diff --git a/test/function/builtin/predicate/ATOMTest.java b/src/test/function/builtin/predicate/ATOMTest.java
similarity index 100%
rename from test/function/builtin/predicate/ATOMTest.java
rename to src/test/function/builtin/predicate/ATOMTest.java
diff --git a/test/function/builtin/predicate/EQTest.java b/src/test/function/builtin/predicate/EQTest.java
similarity index 100%
rename from test/function/builtin/predicate/EQTest.java
rename to src/test/function/builtin/predicate/EQTest.java
diff --git a/test/function/builtin/predicate/EQUALTest.java b/src/test/function/builtin/predicate/EQUALTest.java
similarity index 100%
rename from test/function/builtin/predicate/EQUALTest.java
rename to src/test/function/builtin/predicate/EQUALTest.java
diff --git a/test/function/builtin/predicate/GENSYM_EQUALTest.java b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
similarity index 100%
rename from test/function/builtin/predicate/GENSYM_EQUALTest.java
rename to src/test/function/builtin/predicate/GENSYM_EQUALTest.java
diff --git a/test/function/builtin/predicate/LISTPTest.java b/src/test/function/builtin/predicate/LISTPTest.java
similarity index 100%
rename from test/function/builtin/predicate/LISTPTest.java
rename to src/test/function/builtin/predicate/LISTPTest.java
diff --git a/test/function/builtin/predicate/NULLTest.java b/src/test/function/builtin/predicate/NULLTest.java
similarity index 100%
rename from test/function/builtin/predicate/NULLTest.java
rename to src/test/function/builtin/predicate/NULLTest.java
diff --git a/test/function/builtin/predicate/NUMERIC_EQUALTest.java b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
similarity index 100%
rename from test/function/builtin/predicate/NUMERIC_EQUALTest.java
rename to src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
diff --git a/test/function/builtin/predicate/NUMERIC_GREATERTest.java b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
similarity index 100%
rename from test/function/builtin/predicate/NUMERIC_GREATERTest.java
rename to src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
diff --git a/test/function/builtin/predicate/NUMERIC_LESSTest.java b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
similarity index 100%
rename from test/function/builtin/predicate/NUMERIC_LESSTest.java
rename to src/test/function/builtin/predicate/NUMERIC_LESSTest.java
diff --git a/test/function/builtin/special/ANDTest.java b/src/test/function/builtin/special/ANDTest.java
similarity index 100%
rename from test/function/builtin/special/ANDTest.java
rename to src/test/function/builtin/special/ANDTest.java
diff --git a/test/function/builtin/special/CASETest.java b/src/test/function/builtin/special/CASETest.java
similarity index 100%
rename from test/function/builtin/special/CASETest.java
rename to src/test/function/builtin/special/CASETest.java
diff --git a/test/function/builtin/special/CONDTest.java b/src/test/function/builtin/special/CONDTest.java
similarity index 100%
rename from test/function/builtin/special/CONDTest.java
rename to src/test/function/builtin/special/CONDTest.java
diff --git a/test/function/builtin/special/DEFINE_SPECIALTest.java b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
similarity index 100%
rename from test/function/builtin/special/DEFINE_SPECIALTest.java
rename to src/test/function/builtin/special/DEFINE_SPECIALTest.java
diff --git a/test/function/builtin/special/DEFMACROTest.java b/src/test/function/builtin/special/DEFMACROTest.java
similarity index 100%
rename from test/function/builtin/special/DEFMACROTest.java
rename to src/test/function/builtin/special/DEFMACROTest.java
diff --git a/test/function/builtin/special/DEFUNTest.java b/src/test/function/builtin/special/DEFUNTest.java
similarity index 100%
rename from test/function/builtin/special/DEFUNTest.java
rename to src/test/function/builtin/special/DEFUNTest.java
diff --git a/test/function/builtin/special/FUSETest.java b/src/test/function/builtin/special/FUSETest.java
similarity index 100%
rename from test/function/builtin/special/FUSETest.java
rename to src/test/function/builtin/special/FUSETest.java
diff --git a/test/function/builtin/special/IFTest.java b/src/test/function/builtin/special/IFTest.java
similarity index 100%
rename from test/function/builtin/special/IFTest.java
rename to src/test/function/builtin/special/IFTest.java
diff --git a/test/function/builtin/special/LAMBDATest.java b/src/test/function/builtin/special/LAMBDATest.java
similarity index 100%
rename from test/function/builtin/special/LAMBDATest.java
rename to src/test/function/builtin/special/LAMBDATest.java
diff --git a/test/function/builtin/special/LETTest.java b/src/test/function/builtin/special/LETTest.java
similarity index 100%
rename from test/function/builtin/special/LETTest.java
rename to src/test/function/builtin/special/LETTest.java
diff --git a/test/function/builtin/special/LET_STARTest.java b/src/test/function/builtin/special/LET_STARTest.java
similarity index 100%
rename from test/function/builtin/special/LET_STARTest.java
rename to src/test/function/builtin/special/LET_STARTest.java
diff --git a/test/function/builtin/special/ORTest.java b/src/test/function/builtin/special/ORTest.java
similarity index 100%
rename from test/function/builtin/special/ORTest.java
rename to src/test/function/builtin/special/ORTest.java
diff --git a/test/function/builtin/special/PROGNTest.java b/src/test/function/builtin/special/PROGNTest.java
similarity index 100%
rename from test/function/builtin/special/PROGNTest.java
rename to src/test/function/builtin/special/PROGNTest.java
diff --git a/test/function/builtin/special/QUOTETest.java b/src/test/function/builtin/special/QUOTETest.java
similarity index 100%
rename from test/function/builtin/special/QUOTETest.java
rename to src/test/function/builtin/special/QUOTETest.java
diff --git a/test/function/builtin/special/RECURTest.java b/src/test/function/builtin/special/RECURTest.java
similarity index 100%
rename from test/function/builtin/special/RECURTest.java
rename to src/test/function/builtin/special/RECURTest.java
diff --git a/test/function/builtin/special/SETQTest.java b/src/test/function/builtin/special/SETQTest.java
similarity index 100%
rename from test/function/builtin/special/SETQTest.java
rename to src/test/function/builtin/special/SETQTest.java
diff --git a/test/function/builtin/test-files/load-bad.lisp b/src/test/function/builtin/test-files/load-bad.lisp
similarity index 96%
rename from test/function/builtin/test-files/load-bad.lisp
rename to src/test/function/builtin/test-files/load-bad.lisp
index c078133..3406069 100644
--- a/test/function/builtin/test-files/load-bad.lisp
+++ b/src/test/function/builtin/test-files/load-bad.lisp
@@ -1,50 +1,50 @@
-)(defun extend-null (the-list)
-  (cond
-   ((equal (length the-list) 0) t)
-   (t nil)
-  )
-)
-
-(defun mapcar (function-name the-list)
-  (cond
-   ((null the-list) nil)
-   (t (cons (funcall function-name (first the-list))
-	    (mapcar function-name (rest the-list))))
-  )
-)
-
-(defun maplist (function-name the-list)
-  (cond
-   ((null the-list) nil)
-   (t (cons (funcall function-name the-list)
-	    (maplist function-name (rest the-list))))
-  )
-)
-
-(defun extend-apply (function-name param-list)
-  (eval (cons function-name param-list)))
-
-(defun append (listA listB)
-  (cond
-   ((null listA) listB)
-   (t (cons (first listA) (append (rest listA) listB)))
-  )
-)
-
-(defun second (listA) (first (rest listA)))
-(defun third (listA) (first (rest (rest listA))))
-(defun fourth (listA) (first (rest (rest (rest listA)))))
-(defun fifth (listA) (first (rest (rest (rest (rest listA))))))
-(defun sixth (listA) (first (rest (rest (rest (rest (rest listA)))))))
-(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA))))))))
-(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA)))))))))
-(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))
-(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))))
-
-(defun nth (n listA)
-  (cond
-   ((equal 0 n) (first listA))
-   (t (nth (- n 1) (rest listA)))
-  )
-)
-
+)(defun extend-null (the-list)
+  (cond
+   ((equal (length the-list) 0) t)
+   (t nil)
+  )
+)
+
+(defun mapcar (function-name the-list)
+  (cond
+   ((null the-list) nil)
+   (t (cons (funcall function-name (first the-list))
+	    (mapcar function-name (rest the-list))))
+  )
+)
+
+(defun maplist (function-name the-list)
+  (cond
+   ((null the-list) nil)
+   (t (cons (funcall function-name the-list)
+	    (maplist function-name (rest the-list))))
+  )
+)
+
+(defun extend-apply (function-name param-list)
+  (eval (cons function-name param-list)))
+
+(defun append (listA listB)
+  (cond
+   ((null listA) listB)
+   (t (cons (first listA) (append (rest listA) listB)))
+  )
+)
+
+(defun second (listA) (first (rest listA)))
+(defun third (listA) (first (rest (rest listA))))
+(defun fourth (listA) (first (rest (rest (rest listA)))))
+(defun fifth (listA) (first (rest (rest (rest (rest listA))))))
+(defun sixth (listA) (first (rest (rest (rest (rest (rest listA)))))))
+(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA))))))))
+(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA)))))))))
+(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))
+(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))))
+
+(defun nth (n listA)
+  (cond
+   ((equal 0 n) (first listA))
+   (t (nth (- n 1) (rest listA)))
+  )
+)
+
diff --git a/test/function/builtin/test-files/load-good.lisp b/src/test/function/builtin/test-files/load-good.lisp
similarity index 96%
rename from test/function/builtin/test-files/load-good.lisp
rename to src/test/function/builtin/test-files/load-good.lisp
index ad42d27..61c8fe3 100644
--- a/test/function/builtin/test-files/load-good.lisp
+++ b/src/test/function/builtin/test-files/load-good.lisp
@@ -1,43 +1,43 @@
-(defun extend-null (the-list)
-  (cond
-   ((equal (length the-list) 0) t)
-   (t nil)
-  )
-)
-
-(defun mapcar (function-name the-list)
-  (cond
-   ((null the-list) nil)
-   (t (cons (funcall function-name (first the-list))
-	    (mapcar function-name (rest the-list))))
-  )
-)
-
-(defun maplist (function-name the-list)
-  (cond
-   ((null the-list) nil)
-   (t (cons (funcall function-name the-list)
-	    (maplist function-name (rest the-list))))
-  )
-)
-
-(defun extend-apply (function-name param-list)
-  (eval (cons function-name param-list)))
-
-(defun second (listA) (first (rest listA)))
-(defun third (listA) (first (rest (rest listA))))
-(defun fourth (listA) (first (rest (rest (rest listA)))))
-(defun fifth (listA) (first (rest (rest (rest (rest listA))))))
-(defun sixth (listA) (first (rest (rest (rest (rest (rest listA)))))))
-(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA))))))))
-(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA)))))))))
-(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))
-(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))))
-
-(defun nth (n listA)
-  (cond
-   ((equal 0 n) (first listA))
-   (t (nth (- n 1) (rest listA)))
-  )
-)
-
+(defun extend-null (the-list)
+  (cond
+   ((equal (length the-list) 0) t)
+   (t nil)
+  )
+)
+
+(defun mapcar (function-name the-list)
+  (cond
+   ((null the-list) nil)
+   (t (cons (funcall function-name (first the-list))
+	    (mapcar function-name (rest the-list))))
+  )
+)
+
+(defun maplist (function-name the-list)
+  (cond
+   ((null the-list) nil)
+   (t (cons (funcall function-name the-list)
+	    (maplist function-name (rest the-list))))
+  )
+)
+
+(defun extend-apply (function-name param-list)
+  (eval (cons function-name param-list)))
+
+(defun second (listA) (first (rest listA)))
+(defun third (listA) (first (rest (rest listA))))
+(defun fourth (listA) (first (rest (rest (rest listA)))))
+(defun fifth (listA) (first (rest (rest (rest (rest listA))))))
+(defun sixth (listA) (first (rest (rest (rest (rest (rest listA)))))))
+(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA))))))))
+(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA)))))))))
+(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))
+(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))))
+
+(defun nth (n listA)
+  (cond
+   ((equal 0 n) (first listA))
+   (t (nth (- n 1) (rest listA)))
+  )
+)
+
diff --git a/test/function/builtin/test-files/nested/included.lisp b/src/test/function/builtin/test-files/nested/included.lisp
similarity index 100%
rename from test/function/builtin/test-files/nested/included.lisp
rename to src/test/function/builtin/test-files/nested/included.lisp
diff --git a/test/function/builtin/test-files/nested/nested.lisp b/src/test/function/builtin/test-files/nested/nested.lisp
similarity index 95%
rename from test/function/builtin/test-files/nested/nested.lisp
rename to src/test/function/builtin/test-files/nested/nested.lisp
index 6b67b0b..2dd0091 100644
--- a/test/function/builtin/test-files/nested/nested.lisp
+++ b/src/test/function/builtin/test-files/nested/nested.lisp
@@ -1 +1 @@
-(load "included.lisp")
+(load "included.lisp")
diff --git a/test/function/builtin/test-files/nested/one/load-one.lisp b/src/test/function/builtin/test-files/nested/one/load-one.lisp
similarity index 100%
rename from test/function/builtin/test-files/nested/one/load-one.lisp
rename to src/test/function/builtin/test-files/nested/one/load-one.lisp
diff --git a/test/function/builtin/test-files/nested/one/two/load-two.lisp b/src/test/function/builtin/test-files/nested/one/two/load-two.lisp
similarity index 100%
rename from test/function/builtin/test-files/nested/one/two/load-two.lisp
rename to src/test/function/builtin/test-files/nested/one/two/load-two.lisp
diff --git a/test/function/builtin/test-files/nested/one/two/three/load-three.lisp b/src/test/function/builtin/test-files/nested/one/two/three/load-three.lisp
similarity index 100%
rename from test/function/builtin/test-files/nested/one/two/three/load-three.lisp
rename to src/test/function/builtin/test-files/nested/one/two/three/load-three.lisp
diff --git a/test/interpreter/LispInterpreterTest.java b/src/test/interpreter/LispInterpreterTest.java
similarity index 96%
rename from test/interpreter/LispInterpreterTest.java
rename to src/test/interpreter/LispInterpreterTest.java
index c531f86..913d28a 100644
--- a/test/interpreter/LispInterpreterTest.java
+++ b/src/test/interpreter/LispInterpreterTest.java
@@ -96,7 +96,7 @@ public class LispInterpreterTest {
     @Test
     public void buildFileBasedInterpreter() {
         setCommonFeatures();
-        builder.useFile("test/interpreter/test-files/file.lisp");
+        builder.useFile("src/test/interpreter/test-files/file.lisp");
         LispInterpreter interpreter = builder.build();
 
         assertTrue(interpreter instanceof FileLispInterpreter);
@@ -129,7 +129,7 @@ public class LispInterpreterTest {
     @Test
     public void attemptToBuildInterpreterOnBadFile() {
         setCommonFeatures();
-        builder.useFile("test/interpreter/test-files/does-not-exist.lisp");
+        builder.useFile("src/test/interpreter/test-files/does-not-exist.lisp");
         builder.build();
 
         assertErrorMessageWritten();
@@ -166,7 +166,7 @@ public class LispInterpreterTest {
     @Test
     public void fileBasedInterpreterWorks_PrintsLastValueOnly() {
         setCommonFeatures();
-        builder.useFile("test/interpreter/test-files/file.lisp");
+        builder.useFile("src/test/interpreter/test-files/file.lisp");
         builder.build().interpret();
 
         assertEquals("PICKLE\n\n", outputStream.toString());
diff --git a/test/interpreter/test-files/file.lisp b/src/test/interpreter/test-files/file.lisp
similarity index 100%
rename from test/interpreter/test-files/file.lisp
rename to src/test/interpreter/test-files/file.lisp
diff --git a/test/parser/LispParserTest.java b/src/test/parser/LispParserTest.java
similarity index 100%
rename from test/parser/LispParserTest.java
rename to src/test/parser/LispParserTest.java
diff --git a/test/recursion/TailCallTest.java b/src/test/recursion/TailCallTest.java
similarity index 100%
rename from test/recursion/TailCallTest.java
rename to src/test/recursion/TailCallTest.java
diff --git a/test/scanner/LispCommentRemovingInputStreamTest.java b/src/test/scanner/LispCommentRemovingInputStreamTest.java
similarity index 100%
rename from test/scanner/LispCommentRemovingInputStreamTest.java
rename to src/test/scanner/LispCommentRemovingInputStreamTest.java
diff --git a/test/scanner/LispScannerLineColumnTest.java b/src/test/scanner/LispScannerLineColumnTest.java
similarity index 100%
rename from test/scanner/LispScannerLineColumnTest.java
rename to src/test/scanner/LispScannerLineColumnTest.java
diff --git a/test/scanner/LispScannerTextTest.java b/src/test/scanner/LispScannerTextTest.java
similarity index 100%
rename from test/scanner/LispScannerTextTest.java
rename to src/test/scanner/LispScannerTextTest.java
diff --git a/test/scanner/LispScannerTypeTest.java b/src/test/scanner/LispScannerTypeTest.java
similarity index 100%
rename from test/scanner/LispScannerTypeTest.java
rename to src/test/scanner/LispScannerTypeTest.java
diff --git a/test/sexpression/SExpressionTest.java b/src/test/sexpression/SExpressionTest.java
similarity index 100%
rename from test/sexpression/SExpressionTest.java
rename to src/test/sexpression/SExpressionTest.java
diff --git a/test/stream/SafeInputStreamTest.java b/src/test/stream/SafeInputStreamTest.java
similarity index 100%
rename from test/stream/SafeInputStreamTest.java
rename to src/test/stream/SafeInputStreamTest.java
diff --git a/test/stream/SafeOutputStreamTest.java b/src/test/stream/SafeOutputStreamTest.java
similarity index 100%
rename from test/stream/SafeOutputStreamTest.java
rename to src/test/stream/SafeOutputStreamTest.java
diff --git a/test/table/ExecutionContextTest.java b/src/test/table/ExecutionContextTest.java
similarity index 100%
rename from test/table/ExecutionContextTest.java
rename to src/test/table/ExecutionContextTest.java
diff --git a/test/table/FunctionTableTest.java b/src/test/table/FunctionTableTest.java
similarity index 100%
rename from test/table/FunctionTableTest.java
rename to src/test/table/FunctionTableTest.java
diff --git a/test/table/SymbolTableTest.java b/src/test/table/SymbolTableTest.java
similarity index 100%
rename from test/table/SymbolTableTest.java
rename to src/test/table/SymbolTableTest.java
diff --git a/test/terminal/ControlSequenceHandlerTest.java b/src/test/terminal/ControlSequenceHandlerTest.java
similarity index 100%
rename from test/terminal/ControlSequenceHandlerTest.java
rename to src/test/terminal/ControlSequenceHandlerTest.java
diff --git a/test/terminal/ControlSequenceTest.java b/src/test/terminal/ControlSequenceTest.java
similarity index 100%
rename from test/terminal/ControlSequenceTest.java
rename to src/test/terminal/ControlSequenceTest.java
diff --git a/test/terminal/FlushListener.java b/src/test/terminal/FlushListener.java
similarity index 100%
rename from test/terminal/FlushListener.java
rename to src/test/terminal/FlushListener.java
diff --git a/test/terminal/LispTerminalTest.java b/src/test/terminal/LispTerminalTest.java
similarity index 100%
rename from test/terminal/LispTerminalTest.java
rename to src/test/terminal/LispTerminalTest.java
diff --git a/test/terminal/TerminalConfigurationTest.java b/src/test/terminal/TerminalConfigurationTest.java
similarity index 100%
rename from test/terminal/TerminalConfigurationTest.java
rename to src/test/terminal/TerminalConfigurationTest.java
diff --git a/test/terminal/TerminalHistoryTest.java b/src/test/terminal/TerminalHistoryTest.java
similarity index 100%
rename from test/terminal/TerminalHistoryTest.java
rename to src/test/terminal/TerminalHistoryTest.java
diff --git a/test/terminal/VirtualTerminalInteractor.java b/src/test/terminal/VirtualTerminalInteractor.java
similarity index 100%
rename from test/terminal/VirtualTerminalInteractor.java
rename to src/test/terminal/VirtualTerminalInteractor.java
diff --git a/test/testutil/SymbolAndFunctionCleaner.java b/src/test/testutil/SymbolAndFunctionCleaner.java
similarity index 100%
rename from test/testutil/SymbolAndFunctionCleaner.java
rename to src/test/testutil/SymbolAndFunctionCleaner.java
diff --git a/test/testutil/TestUtilities.java b/src/test/testutil/TestUtilities.java
similarity index 100%
rename from test/testutil/TestUtilities.java
rename to src/test/testutil/TestUtilities.java
diff --git a/test/testutil/TypeAssertions.java b/src/test/testutil/TypeAssertions.java
similarity index 100%
rename from test/testutil/TypeAssertions.java
rename to src/test/testutil/TypeAssertions.java
diff --git a/test/token/TokenFactoryTest.java b/src/test/token/TokenFactoryTest.java
similarity index 100%
rename from test/token/TokenFactoryTest.java
rename to src/test/token/TokenFactoryTest.java
diff --git a/test/util/CharactersTest.java b/src/test/util/CharactersTest.java
similarity index 100%
rename from test/util/CharactersTest.java
rename to src/test/util/CharactersTest.java
diff --git a/test/util/PathTest.java b/src/test/util/PathTest.java
similarity index 100%
rename from test/util/PathTest.java
rename to src/test/util/PathTest.java

From d0cffe75002501d44d720a895b43aa9d5e55a741 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 09:52:53 -0400
Subject: [PATCH 04/16] Update code formatter

---
 .idea/codeStyles/Project.xml                  | 39 +++++++++++++++++++
 src/main/application/LispMain.java            |  1 -
 src/main/environment/RuntimeEnvironment.java  |  1 -
 .../error/CriticalLineColumnException.java    |  1 -
 src/main/error/CriticalLispException.java     |  1 -
 src/main/error/ErrorManager.java              |  4 --
 src/main/error/LineColumnException.java       |  1 -
 src/main/error/LispException.java             |  1 -
 src/main/error/LispWarning.java               |  1 -
 src/main/file/FilePosition.java               |  1 -
 src/main/file/FilePositionTracker.java        |  1 -
 src/main/function/ArgumentValidator.java      |  1 -
 src/main/function/FunctionNames.java          |  1 -
 src/main/function/LispFunction.java           |  1 -
 src/main/function/LispSpecialFunction.java    |  1 -
 src/main/function/UserDefinedFunction.java    |  1 -
 src/main/function/UserDefinedMacro.java       |  1 -
 .../function/UserDefinedSpecialFunction.java  |  1 -
 src/main/function/builtin/APPLY.java          |  1 -
 .../function/builtin/BackquoteEvaluator.java  |  1 -
 src/main/function/builtin/EVAL.java           |  1 -
 src/main/function/builtin/EXIT.java           |  1 -
 src/main/function/builtin/FUNCALL.java        |  1 -
 src/main/function/builtin/FUSE.java           |  1 -
 src/main/function/builtin/GENSYM.java         |  1 -
 src/main/function/builtin/LOAD.java           |  1 -
 src/main/function/builtin/PRINT.java          |  1 -
 src/main/function/builtin/SET.java            |  1 -
 src/main/function/builtin/SYMBOLS.java        |  1 -
 .../function/builtin/SYMBOL_FUNCTION.java     |  1 -
 src/main/function/builtin/cons/CONS.java      |  1 -
 src/main/function/builtin/cons/FIRST.java     |  1 -
 src/main/function/builtin/cons/LENGTH.java    |  1 -
 src/main/function/builtin/cons/LIST.java      |  1 -
 src/main/function/builtin/cons/REST.java      |  1 -
 src/main/function/builtin/math/DIVIDE.java    |  1 -
 src/main/function/builtin/math/MINUS.java     |  1 -
 src/main/function/builtin/math/MODULO.java    |  1 -
 src/main/function/builtin/math/MULTIPLY.java  |  1 -
 .../function/builtin/math/MathFunction.java   |  1 -
 src/main/function/builtin/math/PLUS.java      |  1 -
 src/main/function/builtin/math/REMAINDER.java |  1 -
 src/main/function/builtin/predicate/ATOM.java |  1 -
 src/main/function/builtin/predicate/EQ.java   |  1 -
 .../function/builtin/predicate/EQUAL.java     |  1 -
 .../builtin/predicate/GENSYM_EQUAL.java       |  1 -
 .../function/builtin/predicate/LISTP.java     |  1 -
 src/main/function/builtin/predicate/NULL.java |  1 -
 .../builtin/predicate/NUMERIC_EQUAL.java      |  1 -
 .../builtin/predicate/NUMERIC_GREATER.java    |  1 -
 .../builtin/predicate/NUMERIC_LESS.java       |  1 -
 src/main/function/builtin/special/AND.java    |  1 -
 src/main/function/builtin/special/CASE.java   |  1 -
 src/main/function/builtin/special/COND.java   |  1 -
 .../builtin/special/DEFINE_SPECIAL.java       |  1 -
 .../function/builtin/special/DEFMACRO.java    |  1 -
 src/main/function/builtin/special/DEFUN.java  |  1 -
 src/main/function/builtin/special/Define.java |  1 -
 src/main/function/builtin/special/IF.java     |  1 -
 src/main/function/builtin/special/LAMBDA.java |  1 -
 src/main/function/builtin/special/LET.java    |  1 -
 .../function/builtin/special/LET_STAR.java    |  1 -
 src/main/function/builtin/special/OR.java     |  1 -
 src/main/function/builtin/special/PROGN.java  |  1 -
 src/main/function/builtin/special/QUOTE.java  |  1 -
 src/main/function/builtin/special/RECUR.java  |  1 -
 src/main/function/builtin/special/SETQ.java   |  1 -
 src/main/interpreter/FileLispInterpreter.java |  1 -
 .../InteractiveLispInterpreter.java           |  1 -
 src/main/interpreter/LispInterpreter.java     |  1 -
 .../interpreter/LispInterpreterBuilder.java   |  1 -
 .../LispInterpreterBuilderImpl.java           |  4 --
 src/main/parser/LispParser.java               |  1 -
 src/main/recursion/TailCall.java              |  1 -
 src/main/recursion/TailCalls.java             |  1 -
 .../LispCommentRemovingInputStream.java       |  1 -
 src/main/scanner/LispInputStream.java         |  1 -
 src/main/scanner/LispScanner.java             |  1 -
 src/main/sexpression/AtSignExpression.java    |  1 -
 src/main/sexpression/Atom.java                |  1 -
 src/main/sexpression/BackquoteExpression.java |  1 -
 src/main/sexpression/CommaExpression.java     |  1 -
 src/main/sexpression/Cons.java                |  1 -
 src/main/sexpression/DisplayName.java         |  1 -
 src/main/sexpression/LambdaExpression.java    |  1 -
 src/main/sexpression/LispNumber.java          |  1 -
 src/main/sexpression/LispString.java          |  1 -
 src/main/sexpression/Nil.java                 |  1 -
 src/main/sexpression/SExpression.java         |  1 -
 src/main/sexpression/Symbol.java              |  1 -
 src/main/stream/SafeInputStream.java          |  1 -
 src/main/stream/SafeOutputStream.java         |  1 -
 src/main/stream/UncheckedIOException.java     |  1 -
 src/main/table/FunctionTable.java             |  1 -
 src/main/table/SymbolTable.java               |  1 -
 src/main/terminal/ControlSequenceHandler.java |  1 -
 src/main/terminal/ControlSequenceLookup.java  |  1 -
 src/main/terminal/LispTerminal.java           |  7 ++--
 src/main/terminal/SelectGraphicRendition.java |  5 ---
 src/main/terminal/TerminalConfiguration.java  |  1 -
 src/main/terminal/TerminalHistory.java        |  1 -
 src/main/token/AtSign.java                    |  1 -
 src/main/token/Backquote.java                 |  1 -
 src/main/token/Comma.java                     |  1 -
 src/main/token/Eof.java                       |  1 -
 src/main/token/Identifier.java                |  1 -
 src/main/token/LeftParenthesis.java           |  1 -
 src/main/token/Number.java                    |  1 -
 src/main/token/QuoteMark.java                 |  1 -
 src/main/token/QuotedString.java              |  1 -
 src/main/token/RightParenthesis.java          |  1 -
 src/main/token/Token.java                     |  1 -
 src/main/token/TokenFactory.java              |  1 -
 src/main/token/TokenFactoryImpl.java          | 39 +++++++++----------
 src/main/util/Characters.java                 |  1 -
 src/main/util/Path.java                       |  1 -
 .../fixture/LispInterpreterFixture.java       |  1 -
 src/test/application/MainTest.java            |  5 +--
 .../environment/RuntimeEnvironmentTest.java   | 22 +++++++----
 src/test/error/ErrorManagerTest.java          |  1 -
 src/test/file/FilePositionTrackerTest.java    |  1 -
 src/test/function/ArgumentValidatorTest.java  |  1 -
 src/test/function/LispFunctionTest.java       |  1 -
 .../function/LispSpecialFunctionTest.java     |  1 -
 .../function/UserDefinedFunctionTest.java     |  1 -
 .../builtin/BackquoteEvaluatorTest.java       |  7 ++--
 src/test/function/builtin/EVALTest.java       | 16 +++++---
 src/test/function/builtin/EXITTest.java       |  1 -
 src/test/function/builtin/FUNCALLTest.java    |  1 -
 src/test/function/builtin/GENSYMTest.java     |  1 -
 src/test/function/builtin/LOADTest.java       |  1 -
 src/test/function/builtin/PRINTTest.java      |  1 -
 src/test/function/builtin/SETTest.java        |  1 -
 .../function/builtin/SYMBOL_FUNCTIONTest.java |  1 -
 src/test/function/builtin/cons/CONSTest.java  |  1 -
 src/test/function/builtin/cons/FIRSTTest.java |  1 -
 .../function/builtin/cons/LENGTHTest.java     |  1 -
 src/test/function/builtin/cons/LISTTest.java  |  1 -
 src/test/function/builtin/cons/RESTTest.java  |  1 -
 .../function/builtin/math/DIVIDETest.java     |  1 -
 src/test/function/builtin/math/MINUSTest.java |  1 -
 .../function/builtin/math/MULTIPLYTest.java   |  1 -
 src/test/function/builtin/math/PLUSTest.java  |  1 -
 .../function/builtin/predicate/ATOMTest.java  |  1 -
 .../function/builtin/predicate/EQTest.java    |  1 -
 .../function/builtin/predicate/EQUALTest.java |  1 -
 .../builtin/predicate/GENSYM_EQUALTest.java   |  1 -
 .../function/builtin/predicate/LISTPTest.java |  1 -
 .../function/builtin/predicate/NULLTest.java  |  1 -
 .../builtin/predicate/NUMERIC_EQUALTest.java  |  1 -
 .../predicate/NUMERIC_GREATERTest.java        |  1 -
 .../builtin/predicate/NUMERIC_LESSTest.java   |  1 -
 .../function/builtin/special/ANDTest.java     |  1 -
 .../function/builtin/special/CASETest.java    |  1 -
 .../function/builtin/special/CONDTest.java    |  1 -
 .../builtin/special/DEFINE_SPECIALTest.java   |  1 -
 .../builtin/special/DEFMACROTest.java         |  1 -
 .../function/builtin/special/DEFUNTest.java   |  1 -
 src/test/function/builtin/special/IFTest.java |  1 -
 .../function/builtin/special/LAMBDATest.java  |  1 -
 .../function/builtin/special/LETTest.java     |  1 -
 .../builtin/special/LET_STARTest.java         |  1 -
 src/test/function/builtin/special/ORTest.java |  1 -
 .../function/builtin/special/PROGNTest.java   |  1 -
 .../function/builtin/special/QUOTETest.java   |  1 -
 .../function/builtin/special/RECURTest.java   | 10 +++--
 .../function/builtin/special/SETQTest.java    |  1 -
 src/test/interpreter/LispInterpreterTest.java |  1 -
 src/test/parser/LispParserTest.java           |  4 +-
 src/test/recursion/TailCallTest.java          |  1 -
 .../LispCommentRemovingInputStreamTest.java   |  1 -
 .../scanner/LispScannerLineColumnTest.java    |  1 -
 src/test/scanner/LispScannerTextTest.java     |  1 -
 src/test/scanner/LispScannerTypeTest.java     |  1 -
 src/test/sexpression/SExpressionTest.java     |  1 -
 src/test/stream/SafeInputStreamTest.java      |  1 -
 src/test/stream/SafeOutputStreamTest.java     |  1 -
 src/test/table/ExecutionContextTest.java      |  1 -
 src/test/table/FunctionTableTest.java         |  1 -
 src/test/table/SymbolTableTest.java           |  1 -
 .../terminal/ControlSequenceHandlerTest.java  |  1 -
 src/test/terminal/ControlSequenceTest.java    |  1 -
 src/test/terminal/FlushListener.java          |  1 -
 src/test/terminal/LispTerminalTest.java       |  1 -
 .../terminal/TerminalConfigurationTest.java   |  1 -
 src/test/terminal/TerminalHistoryTest.java    |  1 -
 .../terminal/VirtualTerminalInteractor.java   | 13 ++++---
 .../testutil/SymbolAndFunctionCleaner.java    |  1 -
 src/test/testutil/TestUtilities.java          |  1 -
 src/test/testutil/TypeAssertions.java         |  1 -
 src/test/token/TokenFactoryTest.java          |  1 -
 src/test/util/CharactersTest.java             |  1 -
 src/test/util/PathTest.java                   |  1 -
 193 files changed, 108 insertions(+), 247 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 431b78d..63e4c92 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,47 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+      <option name="ANNOTATION_PARAMETER_WRAP" value="5" />
+      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+    </JavaCodeStyleSettings>
     <XML>
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="RESOURCE_LIST_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="5" />
+      <option name="THROWS_LIST_WRAP" value="5" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="5" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
diff --git a/src/main/application/LispMain.java b/src/main/application/LispMain.java
index 91d8837..16640e5 100644
--- a/src/main/application/LispMain.java
+++ b/src/main/application/LispMain.java
@@ -152,5 +152,4 @@ public class LispMain {
 
         return builder.build();
     }
-
 }
diff --git a/src/main/environment/RuntimeEnvironment.java b/src/main/environment/RuntimeEnvironment.java
index a0d993e..ce0a2aa 100644
--- a/src/main/environment/RuntimeEnvironment.java
+++ b/src/main/environment/RuntimeEnvironment.java
@@ -151,5 +151,4 @@ public class RuntimeEnvironment {
     public String decorateCriticalOutput(String criticalOutput) {
         return criticalOutputDecorator.apply(criticalOutput);
     }
-
 }
diff --git a/src/main/error/CriticalLineColumnException.java b/src/main/error/CriticalLineColumnException.java
index a8c2cc5..7cd9cbb 100644
--- a/src/main/error/CriticalLineColumnException.java
+++ b/src/main/error/CriticalLineColumnException.java
@@ -17,5 +17,4 @@ public abstract class CriticalLineColumnException extends LineColumnException {
     public Severity getSeverity() {
         return CRITICAL;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/error/CriticalLispException.java b/src/main/error/CriticalLispException.java
index b0bb04b..0c06a03 100644
--- a/src/main/error/CriticalLispException.java
+++ b/src/main/error/CriticalLispException.java
@@ -12,5 +12,4 @@ public abstract class CriticalLispException extends LispException {
     public Severity getSeverity() {
         return CRITICAL;
     }
-
 }
diff --git a/src/main/error/ErrorManager.java b/src/main/error/ErrorManager.java
index f4f49ff..9bf41e2 100644
--- a/src/main/error/ErrorManager.java
+++ b/src/main/error/ErrorManager.java
@@ -53,7 +53,6 @@ public class ErrorManager {
     public static enum Severity {
 
         WARNING {
-
             @Override
             public String decorate(String warningOutput, RuntimeEnvironment environment) {
                 return environment.decorateWarningOutput(warningOutput);
@@ -66,7 +65,6 @@ public class ErrorManager {
         },
 
         ERROR {
-
             @Override
             public String decorate(String errorOutput, RuntimeEnvironment environment) {
                 return environment.decorateErrorOutput(errorOutput);
@@ -79,7 +77,6 @@ public class ErrorManager {
         },
 
         CRITICAL {
-
             @Override
             public String decorate(String criticalOutput, RuntimeEnvironment environment) {
                 return environment.decorateCriticalOutput(criticalOutput);
@@ -95,5 +92,4 @@ public class ErrorManager {
 
         public abstract String toDisplayString();
     }
-
 }
diff --git a/src/main/error/LineColumnException.java b/src/main/error/LineColumnException.java
index 6da696a..a559d9e 100644
--- a/src/main/error/LineColumnException.java
+++ b/src/main/error/LineColumnException.java
@@ -22,5 +22,4 @@ public abstract class LineColumnException extends LispException {
     }
 
     public abstract String getMessagePrefix();
-
 }
\ No newline at end of file
diff --git a/src/main/error/LispException.java b/src/main/error/LispException.java
index 32eb330..7d09171 100644
--- a/src/main/error/LispException.java
+++ b/src/main/error/LispException.java
@@ -11,5 +11,4 @@ public abstract class LispException extends RuntimeException {
     public Severity getSeverity() {
         return ERROR;
     }
-
 }
diff --git a/src/main/error/LispWarning.java b/src/main/error/LispWarning.java
index a6351dc..7670a53 100644
--- a/src/main/error/LispWarning.java
+++ b/src/main/error/LispWarning.java
@@ -12,5 +12,4 @@ public abstract class LispWarning extends LispException {
     public Severity getSeverity() {
         return WARNING;
     }
-
 }
diff --git a/src/main/file/FilePosition.java b/src/main/file/FilePosition.java
index e65837b..83cf0e1 100644
--- a/src/main/file/FilePosition.java
+++ b/src/main/file/FilePosition.java
@@ -29,5 +29,4 @@ public class FilePosition {
     public void setColumnNumber(int columnNumber) {
         this.columnNumber = columnNumber;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/file/FilePositionTracker.java b/src/main/file/FilePositionTracker.java
index 6b8074b..bf6c33e 100644
--- a/src/main/file/FilePositionTracker.java
+++ b/src/main/file/FilePositionTracker.java
@@ -28,5 +28,4 @@ public class FilePositionTracker {
         lineNumber++;
         columnNumber = 0;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/function/ArgumentValidator.java b/src/main/function/ArgumentValidator.java
index 9752f8b..e0492f8 100644
--- a/src/main/function/ArgumentValidator.java
+++ b/src/main/function/ArgumentValidator.java
@@ -231,5 +231,4 @@ public class ArgumentValidator {
             return (displayName == null) ? "unknown" : displayName.value();
         }
     }
-
 }
diff --git a/src/main/function/FunctionNames.java b/src/main/function/FunctionNames.java
index 45e173c..5e8005b 100644
--- a/src/main/function/FunctionNames.java
+++ b/src/main/function/FunctionNames.java
@@ -10,5 +10,4 @@ import java.lang.annotation.Target;
 public @interface FunctionNames {
 
     String[] value();
-
 }
diff --git a/src/main/function/LispFunction.java b/src/main/function/LispFunction.java
index 6b6704e..bd2c48b 100644
--- a/src/main/function/LispFunction.java
+++ b/src/main/function/LispFunction.java
@@ -14,5 +14,4 @@ public abstract class LispFunction {
     public boolean isMacro() {
         return false;
     }
-
 }
diff --git a/src/main/function/LispSpecialFunction.java b/src/main/function/LispSpecialFunction.java
index c99941a..3b8953d 100644
--- a/src/main/function/LispSpecialFunction.java
+++ b/src/main/function/LispSpecialFunction.java
@@ -6,5 +6,4 @@ public abstract class LispSpecialFunction extends LispFunction {
     public boolean isArgumentListEvaluated() {
         return false;
     }
-
 }
diff --git a/src/main/function/UserDefinedFunction.java b/src/main/function/UserDefinedFunction.java
index 019fddb..64bbb72 100644
--- a/src/main/function/UserDefinedFunction.java
+++ b/src/main/function/UserDefinedFunction.java
@@ -166,5 +166,4 @@ public class UserDefinedFunction extends LispFunction {
                           parameters);
         }
     }
-
 }
diff --git a/src/main/function/UserDefinedMacro.java b/src/main/function/UserDefinedMacro.java
index b59b67d..02f0baf 100644
--- a/src/main/function/UserDefinedMacro.java
+++ b/src/main/function/UserDefinedMacro.java
@@ -12,5 +12,4 @@ public class UserDefinedMacro extends UserDefinedSpecialFunction {
     public boolean isMacro() {
         return true;
     }
-
 }
diff --git a/src/main/function/UserDefinedSpecialFunction.java b/src/main/function/UserDefinedSpecialFunction.java
index 4ce4010..848c398 100644
--- a/src/main/function/UserDefinedSpecialFunction.java
+++ b/src/main/function/UserDefinedSpecialFunction.java
@@ -12,5 +12,4 @@ public class UserDefinedSpecialFunction extends UserDefinedFunction {
     public boolean isArgumentListEvaluated() {
         return false;
     }
-
 }
diff --git a/src/main/function/builtin/APPLY.java b/src/main/function/builtin/APPLY.java
index 3fd6002..3dbeb62 100644
--- a/src/main/function/builtin/APPLY.java
+++ b/src/main/function/builtin/APPLY.java
@@ -36,5 +36,4 @@ public class APPLY extends LispFunction {
 
         return applyFunction(function, functionArguments);
     }
-
 }
diff --git a/src/main/function/builtin/BackquoteEvaluator.java b/src/main/function/builtin/BackquoteEvaluator.java
index 4ea1eba..67a7b86 100644
--- a/src/main/function/builtin/BackquoteEvaluator.java
+++ b/src/main/function/builtin/BackquoteEvaluator.java
@@ -201,5 +201,4 @@ class BackquoteEvaluator {
             return "at sign did not evaluate to a list";
         }
     }
-
 }
diff --git a/src/main/function/builtin/EVAL.java b/src/main/function/builtin/EVAL.java
index d351753..efbe839 100644
--- a/src/main/function/builtin/EVAL.java
+++ b/src/main/function/builtin/EVAL.java
@@ -228,5 +228,4 @@ public class EVAL extends LispFunction {
             return "unmatched at sign";
         }
     }
-
 }
diff --git a/src/main/function/builtin/EXIT.java b/src/main/function/builtin/EXIT.java
index a46be6c..aabda51 100644
--- a/src/main/function/builtin/EXIT.java
+++ b/src/main/function/builtin/EXIT.java
@@ -28,5 +28,4 @@ public class EXIT extends LispFunction {
 
         return NIL;
     }
-
 }
diff --git a/src/main/function/builtin/FUNCALL.java b/src/main/function/builtin/FUNCALL.java
index 9db896f..30e6685 100644
--- a/src/main/function/builtin/FUNCALL.java
+++ b/src/main/function/builtin/FUNCALL.java
@@ -26,5 +26,4 @@ public class FUNCALL extends LispFunction {
 
         return apply(applyArgs);
     }
-
 }
diff --git a/src/main/function/builtin/FUSE.java b/src/main/function/builtin/FUSE.java
index 30731c2..c662551 100644
--- a/src/main/function/builtin/FUSE.java
+++ b/src/main/function/builtin/FUSE.java
@@ -32,5 +32,4 @@ public class FUSE extends LispFunction {
 
         return new Symbol(left.toString() + SEPARATOR + right.toString());
     }
-
 }
diff --git a/src/main/function/builtin/GENSYM.java b/src/main/function/builtin/GENSYM.java
index d4e21ab..7708426 100644
--- a/src/main/function/builtin/GENSYM.java
+++ b/src/main/function/builtin/GENSYM.java
@@ -39,5 +39,4 @@ public class GENSYM extends LispFunction {
 
         return generateSymbol();
     }
-
 }
diff --git a/src/main/function/builtin/LOAD.java b/src/main/function/builtin/LOAD.java
index 6ec3903..29993db 100644
--- a/src/main/function/builtin/LOAD.java
+++ b/src/main/function/builtin/LOAD.java
@@ -114,5 +114,4 @@ public class LOAD extends LispFunction {
             return format("could not load ''{0}''", fileName);
         }
     }
-
 }
diff --git a/src/main/function/builtin/PRINT.java b/src/main/function/builtin/PRINT.java
index 7f2a1e6..c7a77d4 100644
--- a/src/main/function/builtin/PRINT.java
+++ b/src/main/function/builtin/PRINT.java
@@ -27,5 +27,4 @@ public class PRINT extends LispFunction {
 
         return argument;
     }
-
 }
diff --git a/src/main/function/builtin/SET.java b/src/main/function/builtin/SET.java
index d160d7e..0d3e90b 100644
--- a/src/main/function/builtin/SET.java
+++ b/src/main/function/builtin/SET.java
@@ -54,5 +54,4 @@ public class SET extends LispFunction {
     private boolean isSymbolInTable(SExpression symbol, SymbolTable table) {
         return table.contains(symbol.toString());
     }
-
 }
diff --git a/src/main/function/builtin/SYMBOLS.java b/src/main/function/builtin/SYMBOLS.java
index 38b91be..e1058a6 100644
--- a/src/main/function/builtin/SYMBOLS.java
+++ b/src/main/function/builtin/SYMBOLS.java
@@ -25,5 +25,4 @@ public class SYMBOLS extends LispFunction {
 
         return executionContext.toList();
     }
-
 }
diff --git a/src/main/function/builtin/SYMBOL_FUNCTION.java b/src/main/function/builtin/SYMBOL_FUNCTION.java
index 95cb2aa..022c211 100644
--- a/src/main/function/builtin/SYMBOL_FUNCTION.java
+++ b/src/main/function/builtin/SYMBOL_FUNCTION.java
@@ -60,5 +60,4 @@ public class SYMBOL_FUNCTION extends LispFunction {
             return format("SYMBOL-FUNCTION: undefined function: {0}", function);
         }
     }
-
 }
diff --git a/src/main/function/builtin/cons/CONS.java b/src/main/function/builtin/cons/CONS.java
index 6b0dc6e..3fcb453 100644
--- a/src/main/function/builtin/cons/CONS.java
+++ b/src/main/function/builtin/cons/CONS.java
@@ -26,5 +26,4 @@ public class CONS extends LispFunction {
 
         return new Cons(firstArgument, secondArgument);
     }
-
 }
diff --git a/src/main/function/builtin/cons/FIRST.java b/src/main/function/builtin/cons/FIRST.java
index 83f9fd4..f973ae5 100644
--- a/src/main/function/builtin/cons/FIRST.java
+++ b/src/main/function/builtin/cons/FIRST.java
@@ -24,5 +24,4 @@ public class FIRST extends LispFunction {
 
         return argument.getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/cons/LENGTH.java b/src/main/function/builtin/cons/LENGTH.java
index 1046467..9a1088a 100644
--- a/src/main/function/builtin/cons/LENGTH.java
+++ b/src/main/function/builtin/cons/LENGTH.java
@@ -62,5 +62,4 @@ public class LENGTH extends LispFunction {
     private BigInteger increment(BigInteger number) {
         return number.add(BigInteger.ONE);
     }
-
 }
diff --git a/src/main/function/builtin/cons/LIST.java b/src/main/function/builtin/cons/LIST.java
index a83271d..f45d4f3 100644
--- a/src/main/function/builtin/cons/LIST.java
+++ b/src/main/function/builtin/cons/LIST.java
@@ -27,5 +27,4 @@ public class LIST extends LispFunction {
 
         return argumentList;
     }
-
 }
diff --git a/src/main/function/builtin/cons/REST.java b/src/main/function/builtin/cons/REST.java
index 77eb943..e8e1142 100644
--- a/src/main/function/builtin/cons/REST.java
+++ b/src/main/function/builtin/cons/REST.java
@@ -24,5 +24,4 @@ public class REST extends LispFunction {
 
         return argument.getRest();
     }
-
 }
diff --git a/src/main/function/builtin/math/DIVIDE.java b/src/main/function/builtin/math/DIVIDE.java
index bee44d9..ea1bbf2 100644
--- a/src/main/function/builtin/math/DIVIDE.java
+++ b/src/main/function/builtin/math/DIVIDE.java
@@ -50,5 +50,4 @@ public class DIVIDE extends LispFunction {
             return "divide by zero";
         }
     }
-
 }
diff --git a/src/main/function/builtin/math/MINUS.java b/src/main/function/builtin/math/MINUS.java
index 56d725e..c1c5270 100644
--- a/src/main/function/builtin/math/MINUS.java
+++ b/src/main/function/builtin/math/MINUS.java
@@ -35,5 +35,4 @@ public class MINUS extends LispFunction {
     private LispNumber subtract(LispNumber number1, LispNumber number2) {
         return new LispNumber(number1.getValue().subtract(number2.getValue()));
     }
-
 }
diff --git a/src/main/function/builtin/math/MODULO.java b/src/main/function/builtin/math/MODULO.java
index b092b96..e612b70 100644
--- a/src/main/function/builtin/math/MODULO.java
+++ b/src/main/function/builtin/math/MODULO.java
@@ -41,5 +41,4 @@ public class MODULO extends LispFunction {
             return "modulus not positive";
         }
     }
-
 }
diff --git a/src/main/function/builtin/math/MULTIPLY.java b/src/main/function/builtin/math/MULTIPLY.java
index cbbe45b..f61018a 100644
--- a/src/main/function/builtin/math/MULTIPLY.java
+++ b/src/main/function/builtin/math/MULTIPLY.java
@@ -30,5 +30,4 @@ public class MULTIPLY extends LispFunction {
     private LispNumber multiply(LispNumber number1, LispNumber number2) {
         return new LispNumber(number1.getValue().multiply(number2.getValue()));
     }
-
 }
diff --git a/src/main/function/builtin/math/MathFunction.java b/src/main/function/builtin/math/MathFunction.java
index ec3520a..2cbc075 100644
--- a/src/main/function/builtin/math/MathFunction.java
+++ b/src/main/function/builtin/math/MathFunction.java
@@ -40,5 +40,4 @@ class MathFunction {
 
         return tailCall(() -> callTailRecursive(new Cons(operationResult, remainingNumbers)));
     }
-
 }
diff --git a/src/main/function/builtin/math/PLUS.java b/src/main/function/builtin/math/PLUS.java
index 16677b5..2dd3e3c 100644
--- a/src/main/function/builtin/math/PLUS.java
+++ b/src/main/function/builtin/math/PLUS.java
@@ -30,5 +30,4 @@ public class PLUS extends LispFunction {
     private LispNumber add(LispNumber number1, LispNumber number2) {
         return new LispNumber(number1.getValue().add(number2.getValue()));
     }
-
 }
diff --git a/src/main/function/builtin/math/REMAINDER.java b/src/main/function/builtin/math/REMAINDER.java
index ede2d17..f1a367c 100644
--- a/src/main/function/builtin/math/REMAINDER.java
+++ b/src/main/function/builtin/math/REMAINDER.java
@@ -31,5 +31,4 @@ public class REMAINDER extends LispFunction {
             throw new DivideByZeroException();
         }
     }
-
 }
diff --git a/src/main/function/builtin/predicate/ATOM.java b/src/main/function/builtin/predicate/ATOM.java
index 7c0f604..11259a3 100644
--- a/src/main/function/builtin/predicate/ATOM.java
+++ b/src/main/function/builtin/predicate/ATOM.java
@@ -26,5 +26,4 @@ public class ATOM extends LispFunction {
 
         return argument.isAtom() ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/EQ.java b/src/main/function/builtin/predicate/EQ.java
index a659356..489be54 100644
--- a/src/main/function/builtin/predicate/EQ.java
+++ b/src/main/function/builtin/predicate/EQ.java
@@ -52,5 +52,4 @@ public class EQ extends LispFunction {
     private SExpression listEq(SExpression firstArgument, SExpression secondArgument) {
         return (firstArgument == secondArgument) ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/EQUAL.java b/src/main/function/builtin/predicate/EQUAL.java
index 5038949..52fce66 100644
--- a/src/main/function/builtin/predicate/EQUAL.java
+++ b/src/main/function/builtin/predicate/EQUAL.java
@@ -37,5 +37,4 @@ public class EQUAL extends LispFunction {
     private SExpression equal(SExpression firstArgument, SExpression secondArgument) {
         return isEqual(firstArgument, secondArgument) ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/GENSYM_EQUAL.java b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
index 5ce7214..075a6a2 100644
--- a/src/main/function/builtin/predicate/GENSYM_EQUAL.java
+++ b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
@@ -97,5 +97,4 @@ public class GENSYM_EQUAL extends LispFunction {
             return equalizedExpression;
         }
     }
-
 }
diff --git a/src/main/function/builtin/predicate/LISTP.java b/src/main/function/builtin/predicate/LISTP.java
index 32710f2..7f42a61 100644
--- a/src/main/function/builtin/predicate/LISTP.java
+++ b/src/main/function/builtin/predicate/LISTP.java
@@ -25,5 +25,4 @@ public class LISTP extends LispFunction {
 
         return argumentList.getFirst().isList() ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NULL.java b/src/main/function/builtin/predicate/NULL.java
index bd54ee7..1ad1e9b 100644
--- a/src/main/function/builtin/predicate/NULL.java
+++ b/src/main/function/builtin/predicate/NULL.java
@@ -25,5 +25,4 @@ public class NULL extends LispFunction {
 
         return argumentList.getFirst().isNull() ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
index 76de5e4..6ad23b0 100644
--- a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
+++ b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
@@ -51,5 +51,4 @@ public class NUMERIC_EQUAL extends LispFunction {
     private boolean isEqual(LispNumber number1, LispNumber number2) {
         return number1.getValue().equals(number2.getValue());
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NUMERIC_GREATER.java b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
index 5dbe2e4..af253d4 100644
--- a/src/main/function/builtin/predicate/NUMERIC_GREATER.java
+++ b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
@@ -51,5 +51,4 @@ public class NUMERIC_GREATER extends LispFunction {
     private boolean isFirstGreater(LispNumber number1, LispNumber number2) {
         return number1.getValue().compareTo(number2.getValue()) > 0;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NUMERIC_LESS.java b/src/main/function/builtin/predicate/NUMERIC_LESS.java
index d70950d..4311c4b 100644
--- a/src/main/function/builtin/predicate/NUMERIC_LESS.java
+++ b/src/main/function/builtin/predicate/NUMERIC_LESS.java
@@ -51,5 +51,4 @@ public class NUMERIC_LESS extends LispFunction {
     private boolean isFirstLesser(LispNumber number1, LispNumber number2) {
         return number1.getValue().compareTo(number2.getValue()) < 0;
     }
-
 }
diff --git a/src/main/function/builtin/special/AND.java b/src/main/function/builtin/special/AND.java
index aa18d0c..1930562 100644
--- a/src/main/function/builtin/special/AND.java
+++ b/src/main/function/builtin/special/AND.java
@@ -40,5 +40,4 @@ public class AND extends LispSpecialFunction {
 
         return tailCall(() -> callTailRecursive(remainingValues, currentValue));
     }
-
 }
diff --git a/src/main/function/builtin/special/CASE.java b/src/main/function/builtin/special/CASE.java
index e839f33..6de951e 100644
--- a/src/main/function/builtin/special/CASE.java
+++ b/src/main/function/builtin/special/CASE.java
@@ -82,5 +82,4 @@ public class CASE extends LispSpecialFunction {
 
         return lastConsequentValue;
     }
-
 }
diff --git a/src/main/function/builtin/special/COND.java b/src/main/function/builtin/special/COND.java
index 8875b91..31878ed 100644
--- a/src/main/function/builtin/special/COND.java
+++ b/src/main/function/builtin/special/COND.java
@@ -65,5 +65,4 @@ public class COND extends LispSpecialFunction {
     private SExpression getFirst(SExpression knownCons) {
         return ((Cons) knownCons).getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/special/DEFINE_SPECIAL.java b/src/main/function/builtin/special/DEFINE_SPECIAL.java
index 18a736e..d69d2a1 100644
--- a/src/main/function/builtin/special/DEFINE_SPECIAL.java
+++ b/src/main/function/builtin/special/DEFINE_SPECIAL.java
@@ -17,5 +17,4 @@ public class DEFINE_SPECIAL extends Define {
     protected UserDefinedFunction createFunction(SExpression functionName, Cons lambdaList, Cons functionBody) {
         return new UserDefinedSpecialFunction(functionName.toString(), lambdaList, functionBody);
     }
-
 }
diff --git a/src/main/function/builtin/special/DEFMACRO.java b/src/main/function/builtin/special/DEFMACRO.java
index f59a33d..d228678 100644
--- a/src/main/function/builtin/special/DEFMACRO.java
+++ b/src/main/function/builtin/special/DEFMACRO.java
@@ -17,5 +17,4 @@ public class DEFMACRO extends Define {
     protected UserDefinedFunction createFunction(SExpression functionName, Cons lambdaList, Cons functionBody) {
         return new UserDefinedMacro(functionName.toString(), lambdaList, functionBody);
     }
-
 }
diff --git a/src/main/function/builtin/special/DEFUN.java b/src/main/function/builtin/special/DEFUN.java
index d2cf917..c7fc9eb 100644
--- a/src/main/function/builtin/special/DEFUN.java
+++ b/src/main/function/builtin/special/DEFUN.java
@@ -16,5 +16,4 @@ public class DEFUN extends Define {
     protected UserDefinedFunction createFunction(SExpression functionName, Cons lambdaList, Cons functionBody) {
         return new UserDefinedFunction(functionName.toString(), lambdaList, functionBody);
     }
-
 }
diff --git a/src/main/function/builtin/special/Define.java b/src/main/function/builtin/special/Define.java
index 91697a1..eb065d9 100644
--- a/src/main/function/builtin/special/Define.java
+++ b/src/main/function/builtin/special/Define.java
@@ -74,5 +74,4 @@ public abstract class Define extends LispSpecialFunction {
             return format("redefining function {0}", functionName);
         }
     }
-
 }
diff --git a/src/main/function/builtin/special/IF.java b/src/main/function/builtin/special/IF.java
index b1b5da9..6a58076 100644
--- a/src/main/function/builtin/special/IF.java
+++ b/src/main/function/builtin/special/IF.java
@@ -49,5 +49,4 @@ public class IF extends LispSpecialFunction {
 
         return getRestOfList(expressions).getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/special/LAMBDA.java b/src/main/function/builtin/special/LAMBDA.java
index b33eb5c..a5ad2db 100644
--- a/src/main/function/builtin/special/LAMBDA.java
+++ b/src/main/function/builtin/special/LAMBDA.java
@@ -66,5 +66,4 @@ public class LAMBDA extends LispSpecialFunction {
     private Cons makeOriginalLambdaExpression(Cons argumentList) {
         return new Cons(new Symbol("LAMBDA"), argumentList);
     }
-
 }
diff --git a/src/main/function/builtin/special/LET.java b/src/main/function/builtin/special/LET.java
index 80324d7..ee0e752 100644
--- a/src/main/function/builtin/special/LET.java
+++ b/src/main/function/builtin/special/LET.java
@@ -90,5 +90,4 @@ public class LET extends LispSpecialFunction {
     private void restorePreviousScope(SymbolTable localScope) {
         executionContext.setScope(localScope.getParent());
     }
-
 }
diff --git a/src/main/function/builtin/special/LET_STAR.java b/src/main/function/builtin/special/LET_STAR.java
index 39dca55..41373c5 100644
--- a/src/main/function/builtin/special/LET_STAR.java
+++ b/src/main/function/builtin/special/LET_STAR.java
@@ -19,5 +19,4 @@ public class LET_STAR extends LET {
 
         return localScope;
     }
-
 }
diff --git a/src/main/function/builtin/special/OR.java b/src/main/function/builtin/special/OR.java
index 43ec14e..722e084 100644
--- a/src/main/function/builtin/special/OR.java
+++ b/src/main/function/builtin/special/OR.java
@@ -36,5 +36,4 @@ public class OR extends LispSpecialFunction {
 
         return tailCall(() -> callTailRecursive(remainingValues));
     }
-
 }
diff --git a/src/main/function/builtin/special/PROGN.java b/src/main/function/builtin/special/PROGN.java
index be97589..d819bff 100644
--- a/src/main/function/builtin/special/PROGN.java
+++ b/src/main/function/builtin/special/PROGN.java
@@ -37,5 +37,4 @@ public class PROGN extends LispSpecialFunction {
 
         return tailCall(() -> callTailRecursive(remainingValues, currentValue));
     }
-
 }
diff --git a/src/main/function/builtin/special/QUOTE.java b/src/main/function/builtin/special/QUOTE.java
index 7952140..e0bcb3b 100644
--- a/src/main/function/builtin/special/QUOTE.java
+++ b/src/main/function/builtin/special/QUOTE.java
@@ -22,5 +22,4 @@ public class QUOTE extends LispSpecialFunction {
 
         return argumentList.getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/special/RECUR.java b/src/main/function/builtin/special/RECUR.java
index 4d025f0..66ce1f8 100644
--- a/src/main/function/builtin/special/RECUR.java
+++ b/src/main/function/builtin/special/RECUR.java
@@ -87,5 +87,4 @@ public class RECUR extends LispSpecialFunction {
             return "recur not in tail position";
         }
     }
-
 }
diff --git a/src/main/function/builtin/special/SETQ.java b/src/main/function/builtin/special/SETQ.java
index 0dc6229..4572ca5 100644
--- a/src/main/function/builtin/special/SETQ.java
+++ b/src/main/function/builtin/special/SETQ.java
@@ -35,5 +35,4 @@ public class SETQ extends LispSpecialFunction {
 
         return new Cons(argumentList.getFirst(), makeList(value));
     }
-
 }
diff --git a/src/main/interpreter/FileLispInterpreter.java b/src/main/interpreter/FileLispInterpreter.java
index f5c0288..8b6bd98 100644
--- a/src/main/interpreter/FileLispInterpreter.java
+++ b/src/main/interpreter/FileLispInterpreter.java
@@ -25,5 +25,4 @@ public class FileLispInterpreter extends LispInterpreter {
 
         super.applyFinishingTouches();
     }
-
 }
diff --git a/src/main/interpreter/InteractiveLispInterpreter.java b/src/main/interpreter/InteractiveLispInterpreter.java
index 94fb537..f326475 100644
--- a/src/main/interpreter/InteractiveLispInterpreter.java
+++ b/src/main/interpreter/InteractiveLispInterpreter.java
@@ -21,5 +21,4 @@ public class InteractiveLispInterpreter extends LispInterpreter {
         environment.getOutput().println(environment.decoratePrompt(""));
         environment.getOutput().flush();
     }
-
 }
diff --git a/src/main/interpreter/LispInterpreter.java b/src/main/interpreter/LispInterpreter.java
index 36f6a92..1c9fca2 100644
--- a/src/main/interpreter/LispInterpreter.java
+++ b/src/main/interpreter/LispInterpreter.java
@@ -90,5 +90,4 @@ public class LispInterpreter {
             return name;
         }
     }
-
 }
diff --git a/src/main/interpreter/LispInterpreterBuilder.java b/src/main/interpreter/LispInterpreterBuilder.java
index c21a02c..ff6267b 100644
--- a/src/main/interpreter/LispInterpreterBuilder.java
+++ b/src/main/interpreter/LispInterpreterBuilder.java
@@ -35,5 +35,4 @@ public interface LispInterpreterBuilder {
     LispInterpreter build();
 
     default void reset() {}
-
 }
diff --git a/src/main/interpreter/LispInterpreterBuilderImpl.java b/src/main/interpreter/LispInterpreterBuilderImpl.java
index 5524074..d73ba90 100644
--- a/src/main/interpreter/LispInterpreterBuilderImpl.java
+++ b/src/main/interpreter/LispInterpreterBuilderImpl.java
@@ -63,7 +63,6 @@ public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
     @Override
     public void setOutput(PrintStream outputStream) {
         this.outputStream = outputStream;
-
     }
 
     @Override
@@ -115,13 +114,11 @@ public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
     @Override
     public void setWarningOutputDecorator(Function<String, String> decorator) {
         this.warningOutputDecorator = decorator;
-
     }
 
     @Override
     public void setErrorOutputDecorator(Function<String, String> decorator) {
         this.errorOutputDecorator = decorator;
-
     }
 
     @Override
@@ -217,5 +214,4 @@ public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
             return message;
         }
     }
-
 }
diff --git a/src/main/parser/LispParser.java b/src/main/parser/LispParser.java
index e28ff58..160db7d 100644
--- a/src/main/parser/LispParser.java
+++ b/src/main/parser/LispParser.java
@@ -60,5 +60,4 @@ public class LispParser {
             throw exceptionToThrow;
         }
     }
-
 }
diff --git a/src/main/recursion/TailCall.java b/src/main/recursion/TailCall.java
index 260425f..cf21548 100644
--- a/src/main/recursion/TailCall.java
+++ b/src/main/recursion/TailCall.java
@@ -26,5 +26,4 @@ public interface TailCall<T> {
 
         // @formatter:on
     }
-
 }
diff --git a/src/main/recursion/TailCalls.java b/src/main/recursion/TailCalls.java
index f5137b6..3950b2f 100644
--- a/src/main/recursion/TailCalls.java
+++ b/src/main/recursion/TailCalls.java
@@ -25,5 +25,4 @@ public class TailCalls {
             }
         };
     }
-
 }
\ No newline at end of file
diff --git a/src/main/scanner/LispCommentRemovingInputStream.java b/src/main/scanner/LispCommentRemovingInputStream.java
index 084a34d..c866076 100644
--- a/src/main/scanner/LispCommentRemovingInputStream.java
+++ b/src/main/scanner/LispCommentRemovingInputStream.java
@@ -80,5 +80,4 @@ public class LispCommentRemovingInputStream implements LispInputStream {
 
         this.rereadLastCharacter = true;
     }
-
 }
diff --git a/src/main/scanner/LispInputStream.java b/src/main/scanner/LispInputStream.java
index 014afd0..aa856a0 100644
--- a/src/main/scanner/LispInputStream.java
+++ b/src/main/scanner/LispInputStream.java
@@ -12,5 +12,4 @@ public interface LispInputStream {
 
         private static final long serialVersionUID = 1L;
     }
-
 }
diff --git a/src/main/scanner/LispScanner.java b/src/main/scanner/LispScanner.java
index 3e58834..1b8a1cc 100644
--- a/src/main/scanner/LispScanner.java
+++ b/src/main/scanner/LispScanner.java
@@ -183,5 +183,4 @@ public class LispScanner {
             return "unterminated quoted string";
         }
     }
-
 }
diff --git a/src/main/sexpression/AtSignExpression.java b/src/main/sexpression/AtSignExpression.java
index bb73362..98c3008 100644
--- a/src/main/sexpression/AtSignExpression.java
+++ b/src/main/sexpression/AtSignExpression.java
@@ -21,5 +21,4 @@ public class AtSignExpression extends SExpression {
     public String toString() {
         return "@" + expression;
     }
-
 }
diff --git a/src/main/sexpression/Atom.java b/src/main/sexpression/Atom.java
index 69c973b..14ff7b1 100644
--- a/src/main/sexpression/Atom.java
+++ b/src/main/sexpression/Atom.java
@@ -18,5 +18,4 @@ public abstract class Atom extends SExpression {
     public String toString() {
         return text;
     }
-
 }
diff --git a/src/main/sexpression/BackquoteExpression.java b/src/main/sexpression/BackquoteExpression.java
index ec88673..ec59adc 100644
--- a/src/main/sexpression/BackquoteExpression.java
+++ b/src/main/sexpression/BackquoteExpression.java
@@ -21,5 +21,4 @@ public class BackquoteExpression extends SExpression {
     public String toString() {
         return "`" + expression;
     }
-
 }
diff --git a/src/main/sexpression/CommaExpression.java b/src/main/sexpression/CommaExpression.java
index b10b7a6..71e4744 100644
--- a/src/main/sexpression/CommaExpression.java
+++ b/src/main/sexpression/CommaExpression.java
@@ -21,5 +21,4 @@ public class CommaExpression extends SExpression {
     public String toString() {
         return "," + expression;
     }
-
 }
diff --git a/src/main/sexpression/Cons.java b/src/main/sexpression/Cons.java
index 4789224..a3652c1 100644
--- a/src/main/sexpression/Cons.java
+++ b/src/main/sexpression/Cons.java
@@ -53,5 +53,4 @@ public class Cons extends SExpression {
 
         return done(leadingString.append(" . " + rest.toString() + ")").toString());
     }
-
 }
diff --git a/src/main/sexpression/DisplayName.java b/src/main/sexpression/DisplayName.java
index fc97d80..d116ce7 100644
--- a/src/main/sexpression/DisplayName.java
+++ b/src/main/sexpression/DisplayName.java
@@ -10,5 +10,4 @@ import java.lang.annotation.Target;
 public @interface DisplayName {
 
     String value();
-
 }
diff --git a/src/main/sexpression/LambdaExpression.java b/src/main/sexpression/LambdaExpression.java
index 04a9d5c..0c46ebc 100644
--- a/src/main/sexpression/LambdaExpression.java
+++ b/src/main/sexpression/LambdaExpression.java
@@ -30,5 +30,4 @@ public class LambdaExpression extends SExpression {
     public String toString() {
         return lambdaExpression.toString();
     }
-
 }
diff --git a/src/main/sexpression/LispNumber.java b/src/main/sexpression/LispNumber.java
index bb00a96..ebd4c70 100644
--- a/src/main/sexpression/LispNumber.java
+++ b/src/main/sexpression/LispNumber.java
@@ -53,5 +53,4 @@ public class LispNumber extends Atom {
             return format("{0} is not a valid integer", text);
         }
     }
-
 }
diff --git a/src/main/sexpression/LispString.java b/src/main/sexpression/LispString.java
index 89898ff..e433eac 100644
--- a/src/main/sexpression/LispString.java
+++ b/src/main/sexpression/LispString.java
@@ -11,5 +11,4 @@ public class LispString extends Atom {
     public boolean isString() {
         return true;
     }
-
 }
diff --git a/src/main/sexpression/Nil.java b/src/main/sexpression/Nil.java
index cf3bc9a..6192673 100644
--- a/src/main/sexpression/Nil.java
+++ b/src/main/sexpression/Nil.java
@@ -48,5 +48,4 @@ public class Nil extends Cons {
     public String toString() {
         return "NIL";
     }
-
 }
diff --git a/src/main/sexpression/SExpression.java b/src/main/sexpression/SExpression.java
index acc99ed..476bf97 100644
--- a/src/main/sexpression/SExpression.java
+++ b/src/main/sexpression/SExpression.java
@@ -46,5 +46,4 @@ public abstract class SExpression {
     public boolean isAtSign() {
         return false;
     }
-
 }
diff --git a/src/main/sexpression/Symbol.java b/src/main/sexpression/Symbol.java
index ae6e032..3e998b9 100644
--- a/src/main/sexpression/Symbol.java
+++ b/src/main/sexpression/Symbol.java
@@ -19,5 +19,4 @@ public class Symbol extends Atom {
     public boolean isSymbol() {
         return true;
     }
-
 }
diff --git a/src/main/stream/SafeInputStream.java b/src/main/stream/SafeInputStream.java
index e817994..ae3c06c 100644
--- a/src/main/stream/SafeInputStream.java
+++ b/src/main/stream/SafeInputStream.java
@@ -29,5 +29,4 @@ public class SafeInputStream {
             throw new UncheckedIOException(e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/stream/SafeOutputStream.java b/src/main/stream/SafeOutputStream.java
index e82beae..effde5f 100644
--- a/src/main/stream/SafeOutputStream.java
+++ b/src/main/stream/SafeOutputStream.java
@@ -35,5 +35,4 @@ public class SafeOutputStream {
             throw new UncheckedIOException(e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/stream/UncheckedIOException.java b/src/main/stream/UncheckedIOException.java
index de93070..196221e 100644
--- a/src/main/stream/UncheckedIOException.java
+++ b/src/main/stream/UncheckedIOException.java
@@ -17,5 +17,4 @@ public class UncheckedIOException extends CriticalLispException {
     public String getMessage() {
         return exception.getMessage();
     }
-
 }
\ No newline at end of file
diff --git a/src/main/table/FunctionTable.java b/src/main/table/FunctionTable.java
index 8a82eba..4bcabbd 100644
--- a/src/main/table/FunctionTable.java
+++ b/src/main/table/FunctionTable.java
@@ -197,5 +197,4 @@ public class FunctionTable {
             return format("Could not create an instance of ''{0}''", functionName);
         }
     }
-
 }
diff --git a/src/main/table/SymbolTable.java b/src/main/table/SymbolTable.java
index 0088983..f8a5aaf 100644
--- a/src/main/table/SymbolTable.java
+++ b/src/main/table/SymbolTable.java
@@ -63,5 +63,4 @@ public class SymbolTable {
     private Cons makeSymbolValuePair(Entry<String, SExpression> binding) {
         return new Cons(new Symbol(binding.getKey()), makeList(binding.getValue()));
     }
-
 }
diff --git a/src/main/terminal/ControlSequenceHandler.java b/src/main/terminal/ControlSequenceHandler.java
index fa4a4c3..395ba5a 100644
--- a/src/main/terminal/ControlSequenceHandler.java
+++ b/src/main/terminal/ControlSequenceHandler.java
@@ -57,5 +57,4 @@ class ControlSequenceHandler {
     private boolean isPartOfCode() {
         return isCharacter() && isDigit((char) currentCharacter);
     }
-
 }
diff --git a/src/main/terminal/ControlSequenceLookup.java b/src/main/terminal/ControlSequenceLookup.java
index 59b3f9a..ac21133 100644
--- a/src/main/terminal/ControlSequenceLookup.java
+++ b/src/main/terminal/ControlSequenceLookup.java
@@ -31,5 +31,4 @@ public class ControlSequenceLookup {
 
         return codes.getOrDefault(code, new NullControlSequence());
     }
-
 }
\ No newline at end of file
diff --git a/src/main/terminal/LispTerminal.java b/src/main/terminal/LispTerminal.java
index 771c860..119314f 100644
--- a/src/main/terminal/LispTerminal.java
+++ b/src/main/terminal/LispTerminal.java
@@ -210,7 +210,8 @@ public class LispTerminal {
             TerminalPosition cursorPosition = terminal.getCursorPosition();
             terminal.putCharacter(character);
             moveCursorToNextRow(cursorPosition);
-        } else
+        }
+        else
             terminal.putCharacter(character);
     }
 
@@ -393,7 +394,8 @@ public class LispTerminal {
     private void takeNap() {
         try {
             Thread.sleep(1);
-        } catch (InterruptedException ignored) {}
+        } catch (InterruptedException ignored) {
+        }
     }
 
     private void writeOutput() {
@@ -458,5 +460,4 @@ public class LispTerminal {
         isStopped = true;
         inputWriter.close();
     }
-
 }
diff --git a/src/main/terminal/SelectGraphicRendition.java b/src/main/terminal/SelectGraphicRendition.java
index aa71a4c..9b4d9b5 100644
--- a/src/main/terminal/SelectGraphicRendition.java
+++ b/src/main/terminal/SelectGraphicRendition.java
@@ -6,7 +6,6 @@ import com.googlecode.lanterna.terminal.IOSafeTerminal;
 public enum SelectGraphicRendition implements ControlSequence {
 
     RESET {
-
         @Override
         public String getCode() {
             return "0";
@@ -19,7 +18,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     RED {
-
         @Override
         public String getCode() {
             return "31";
@@ -32,7 +30,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     GREEN {
-
         @Override
         public String getCode() {
             return "32";
@@ -45,7 +42,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     YELLOW {
-
         @Override
         public String getCode() {
             return "33";
@@ -58,7 +54,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     PURPLE {
-
         @Override
         public String getCode() {
             return "35";
diff --git a/src/main/terminal/TerminalConfiguration.java b/src/main/terminal/TerminalConfiguration.java
index 0a26a35..294a52c 100644
--- a/src/main/terminal/TerminalConfiguration.java
+++ b/src/main/terminal/TerminalConfiguration.java
@@ -67,5 +67,4 @@ public class TerminalConfiguration {
     public IOSafeTerminal getTerminal() {
         return terminal;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/terminal/TerminalHistory.java b/src/main/terminal/TerminalHistory.java
index e2b6f25..63fb0ca 100644
--- a/src/main/terminal/TerminalHistory.java
+++ b/src/main/terminal/TerminalHistory.java
@@ -49,5 +49,4 @@ public class TerminalHistory {
     public boolean isEnd() {
         return lineIndex == lastIndex();
     }
-
 }
diff --git a/src/main/token/AtSign.java b/src/main/token/AtSign.java
index d057b5e..483ad17 100644
--- a/src/main/token/AtSign.java
+++ b/src/main/token/AtSign.java
@@ -19,5 +19,4 @@ public class AtSign extends Token {
 
         return new AtSignExpression(argument);
     }
-
 }
diff --git a/src/main/token/Backquote.java b/src/main/token/Backquote.java
index 4b10cbe..5fdb321 100644
--- a/src/main/token/Backquote.java
+++ b/src/main/token/Backquote.java
@@ -19,5 +19,4 @@ public class Backquote extends Token {
 
         return new BackquoteExpression(argument);
     }
-
 }
diff --git a/src/main/token/Comma.java b/src/main/token/Comma.java
index 0a419fe..ad90e75 100644
--- a/src/main/token/Comma.java
+++ b/src/main/token/Comma.java
@@ -19,5 +19,4 @@ public class Comma extends Token {
 
         return new CommaExpression(argument);
     }
-
 }
diff --git a/src/main/token/Eof.java b/src/main/token/Eof.java
index 4034a6b..70d4b09 100644
--- a/src/main/token/Eof.java
+++ b/src/main/token/Eof.java
@@ -30,5 +30,4 @@ public class Eof extends Token {
             return "end-of-file encountered";
         }
     }
-
 }
diff --git a/src/main/token/Identifier.java b/src/main/token/Identifier.java
index f425de4..77c270e 100644
--- a/src/main/token/Identifier.java
+++ b/src/main/token/Identifier.java
@@ -16,5 +16,4 @@ public class Identifier extends Token {
     public SExpression parseSExpression(Supplier<Token> getNextToken) {
         return new Symbol(getText());
     }
-
 }
diff --git a/src/main/token/LeftParenthesis.java b/src/main/token/LeftParenthesis.java
index 1f27542..409e998 100644
--- a/src/main/token/LeftParenthesis.java
+++ b/src/main/token/LeftParenthesis.java
@@ -17,5 +17,4 @@ public class LeftParenthesis extends Token {
 
         return nextToken.parseListTail(getNextToken).invoke();
     }
-
 }
diff --git a/src/main/token/Number.java b/src/main/token/Number.java
index dad0d82..e4f29aa 100644
--- a/src/main/token/Number.java
+++ b/src/main/token/Number.java
@@ -16,5 +16,4 @@ public class Number extends Token {
     public SExpression parseSExpression(Supplier<Token> getNextToken) {
         return new LispNumber(getText());
     }
-
 }
diff --git a/src/main/token/QuoteMark.java b/src/main/token/QuoteMark.java
index 8dba568..10a0f1b 100644
--- a/src/main/token/QuoteMark.java
+++ b/src/main/token/QuoteMark.java
@@ -22,5 +22,4 @@ public class QuoteMark extends Token {
 
         return new Cons(Symbol.createQuote(), new Cons(argument, NIL));
     }
-
 }
diff --git a/src/main/token/QuotedString.java b/src/main/token/QuotedString.java
index 22b08b9..17f281c 100644
--- a/src/main/token/QuotedString.java
+++ b/src/main/token/QuotedString.java
@@ -16,5 +16,4 @@ public class QuotedString extends Token {
     public SExpression parseSExpression(Supplier<Token> getNextToken) {
         return new LispString(getText());
     }
-
 }
diff --git a/src/main/token/RightParenthesis.java b/src/main/token/RightParenthesis.java
index e76b9d6..ec30d8e 100644
--- a/src/main/token/RightParenthesis.java
+++ b/src/main/token/RightParenthesis.java
@@ -45,5 +45,4 @@ public class RightParenthesis extends Token {
             return "expression begins with ')'";
         }
     }
-
 }
diff --git a/src/main/token/Token.java b/src/main/token/Token.java
index 14e479f..c23b777 100644
--- a/src/main/token/Token.java
+++ b/src/main/token/Token.java
@@ -52,5 +52,4 @@ public abstract class Token {
 
         return tailCall(() -> next.parseListTailRecursive(start, newEnd, getNextToken));
     }
-
 }
diff --git a/src/main/token/TokenFactory.java b/src/main/token/TokenFactory.java
index d35aa89..cf3cbc4 100644
--- a/src/main/token/TokenFactory.java
+++ b/src/main/token/TokenFactory.java
@@ -41,5 +41,4 @@ public interface TokenFactory {
             return format("illegal character >>{0}<<", text);
         }
     }
-
 }
diff --git a/src/main/token/TokenFactoryImpl.java b/src/main/token/TokenFactoryImpl.java
index 706df21..25adace 100644
--- a/src/main/token/TokenFactoryImpl.java
+++ b/src/main/token/TokenFactoryImpl.java
@@ -23,25 +23,25 @@ public class TokenFactoryImpl implements TokenFactory {
         char firstCharacter = text.charAt(0);
 
         switch (firstCharacter) {
-        case LEFT_PARENTHESIS:
-            return new LeftParenthesis(text, position);
-        case RIGHT_PARENTHESIS:
-            return new RightParenthesis(text, position);
-        case SINGLE_QUOTE:
-            return new QuoteMark(text, position);
-        case DOUBLE_QUOTE:
-            return new QuotedString(text, position);
-        case BACKQUOTE:
-            return new Backquote(text, position);
-        case AT_SIGN:
-            return new AtSign(text, position);
-        case COMMA:
-            return new Comma(text, position);
-        default:
-            if (isNumeric(firstCharacter, text))
-                return new Number(text, position);
-            else if (isLegalIdentifierCharacter(firstCharacter))
-                return new Identifier(text, position);
+            case LEFT_PARENTHESIS:
+                return new LeftParenthesis(text, position);
+            case RIGHT_PARENTHESIS:
+                return new RightParenthesis(text, position);
+            case SINGLE_QUOTE:
+                return new QuoteMark(text, position);
+            case DOUBLE_QUOTE:
+                return new QuotedString(text, position);
+            case BACKQUOTE:
+                return new Backquote(text, position);
+            case AT_SIGN:
+                return new AtSign(text, position);
+            case COMMA:
+                return new Comma(text, position);
+            default:
+                if (isNumeric(firstCharacter, text))
+                    return new Number(text, position);
+                else if (isLegalIdentifierCharacter(firstCharacter))
+                    return new Identifier(text, position);
         }
 
         throw new BadCharacterException(text, position);
@@ -63,5 +63,4 @@ public class TokenFactoryImpl implements TokenFactory {
     public Token createEofToken(FilePosition position) {
         return new Eof("EOF", position);
     }
-
 }
diff --git a/src/main/util/Characters.java b/src/main/util/Characters.java
index 8211812..7a3a2e9 100644
--- a/src/main/util/Characters.java
+++ b/src/main/util/Characters.java
@@ -57,5 +57,4 @@ public final class Characters {
     public static boolean isNumberPrefix(char c) {
         return c == DASH || c == PLUS;
     }
-
 }
diff --git a/src/main/util/Path.java b/src/main/util/Path.java
index 4cd97db..c845e8e 100644
--- a/src/main/util/Path.java
+++ b/src/main/util/Path.java
@@ -9,5 +9,4 @@ public final class Path {
     public static String getPathPrefix(String fileName) {
         return fileName.substring(0, fileName.lastIndexOf(File.separator) + 1);
     }
-
 }
diff --git a/src/test/acceptance/fixture/LispInterpreterFixture.java b/src/test/acceptance/fixture/LispInterpreterFixture.java
index 622f6a3..f084f1f 100644
--- a/src/test/acceptance/fixture/LispInterpreterFixture.java
+++ b/src/test/acceptance/fixture/LispInterpreterFixture.java
@@ -75,5 +75,4 @@ public class LispInterpreterFixture {
 
         return output.trim();
     }
-
 }
diff --git a/src/test/application/MainTest.java b/src/test/application/MainTest.java
index f385856..321aa17 100644
--- a/src/test/application/MainTest.java
+++ b/src/test/application/MainTest.java
@@ -64,7 +64,8 @@ public class MainTest extends SymbolAndFunctionCleaner {
     private void waitForInterpreterToShutdown() {
         try {
             latch.await();
-        } catch (InterruptedException ignored) {}
+        } catch (InterruptedException ignored) {
+        }
     }
 
     private String getSystemOutLog() {
@@ -106,7 +107,6 @@ public class MainTest extends SymbolAndFunctionCleaner {
         exit.checkAssertionAfterwards(() -> {
             assertEquals(format("{0}{1}{2}\n", ANSI_PURPLE, expectedMessage, ANSI_RESET), getSystemErrLog());
             assertEquals("", getSystemOutLog());
-
         });
 
         runInterpreterWithFile("src/test/application/test-files/bad.lisp");
@@ -143,5 +143,4 @@ public class MainTest extends SymbolAndFunctionCleaner {
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
     }
-
 }
diff --git a/src/test/environment/RuntimeEnvironmentTest.java b/src/test/environment/RuntimeEnvironmentTest.java
index a18820a..099df93 100644
--- a/src/test/environment/RuntimeEnvironmentTest.java
+++ b/src/test/environment/RuntimeEnvironmentTest.java
@@ -158,37 +158,43 @@ public class RuntimeEnvironmentTest {
         try {
             environment.terminateSuccessfully();
             fail("terminateSuccessfully");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.terminateExceptionally();
             fail("terminateExceptionally");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decoratePrompt("");
             fail("decoratePrompt");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateValueOutput("");
             fail("decorateValueOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateWarningOutput("");
             fail("decorateWarningOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateErrorOutput("");
             fail("decorateErrorOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateCriticalOutput("");
             fail("decorateCriticalOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
     }
-
 }
diff --git a/src/test/error/ErrorManagerTest.java b/src/test/error/ErrorManagerTest.java
index d04f4c6..3075765 100644
--- a/src/test/error/ErrorManagerTest.java
+++ b/src/test/error/ErrorManagerTest.java
@@ -163,5 +163,4 @@ public class ErrorManagerTest {
         for (Severity severity : Severity.values())
             Severity.valueOf(severity.toString());
     }
-
 }
diff --git a/src/test/file/FilePositionTrackerTest.java b/src/test/file/FilePositionTrackerTest.java
index b62ddf3..715ae16 100644
--- a/src/test/file/FilePositionTrackerTest.java
+++ b/src/test/file/FilePositionTrackerTest.java
@@ -62,5 +62,4 @@ public class FilePositionTrackerTest {
 
         assertTrackerPositionEquals(createFilePosition(2, 0));
     }
-
 }
diff --git a/src/test/function/ArgumentValidatorTest.java b/src/test/function/ArgumentValidatorTest.java
index 6900fd2..cfb8291 100644
--- a/src/test/function/ArgumentValidatorTest.java
+++ b/src/test/function/ArgumentValidatorTest.java
@@ -222,5 +222,4 @@ public class ArgumentValidatorTest {
         validator.setEveryArgumentExcludedType(Nil.class);
         validator.validate(new Cons(T, new Cons(NIL, NIL)));
     }
-
 }
diff --git a/src/test/function/LispFunctionTest.java b/src/test/function/LispFunctionTest.java
index 7bb4760..9a516e4 100644
--- a/src/test/function/LispFunctionTest.java
+++ b/src/test/function/LispFunctionTest.java
@@ -21,5 +21,4 @@ public class LispFunctionTest {
 
         assertTrue(lispFunction.isArgumentListEvaluated());
     }
-
 }
diff --git a/src/test/function/LispSpecialFunctionTest.java b/src/test/function/LispSpecialFunctionTest.java
index 87c1b6a..300c61a 100644
--- a/src/test/function/LispSpecialFunctionTest.java
+++ b/src/test/function/LispSpecialFunctionTest.java
@@ -21,5 +21,4 @@ public class LispSpecialFunctionTest {
 
         assertFalse(lispFunction.isArgumentListEvaluated());
     }
-
 }
diff --git a/src/test/function/UserDefinedFunctionTest.java b/src/test/function/UserDefinedFunctionTest.java
index 1ec8d3c..1d35be5 100644
--- a/src/test/function/UserDefinedFunctionTest.java
+++ b/src/test/function/UserDefinedFunctionTest.java
@@ -77,5 +77,4 @@ public class UserDefinedFunctionTest {
         assertTrue(e.getMessage().length() > 0);
         assertEquals(ErrorManager.Severity.ERROR, e.getSeverity());
     }
-
 }
diff --git a/src/test/function/builtin/BackquoteEvaluatorTest.java b/src/test/function/builtin/BackquoteEvaluatorTest.java
index 88a3241..071a921 100644
--- a/src/test/function/builtin/BackquoteEvaluatorTest.java
+++ b/src/test/function/builtin/BackquoteEvaluatorTest.java
@@ -95,7 +95,8 @@ public class BackquoteEvaluatorTest {
 
     @Test(expected = NestedAtSignException.class)
     public void evaluateListWithNestedAtSigns() {
-        SExpression input = makeList(new CommaExpression(new AtSignExpression(new AtSignExpression(makeList(new Symbol("+"))))));
+        SExpression input =
+                makeList(new CommaExpression(new AtSignExpression(new AtSignExpression(makeList(new Symbol("+"))))));
         BackquoteEvaluator evaluator = createBackquoteEvaluator(input);
 
         evaluator.evaluate();
@@ -103,7 +104,8 @@ public class BackquoteEvaluatorTest {
 
     @Test(expected = NestedCommaException.class)
     public void evaluateListWithCommaAfterAtSign() {
-        SExpression input = makeList(new CommaExpression(new AtSignExpression(new CommaExpression(makeList(new Symbol("+"))))));
+        SExpression input =
+                makeList(new CommaExpression(new AtSignExpression(new CommaExpression(makeList(new Symbol("+"))))));
         BackquoteEvaluator evaluator = createBackquoteEvaluator(input);
 
         evaluator.evaluate();
@@ -174,5 +176,4 @@ public class BackquoteEvaluatorTest {
         assertIsErrorWithMessage(new AtSignNotInCommaException());
         assertIsErrorWithMessage(new AtSignNotListException());
     }
-
 }
diff --git a/src/test/function/builtin/EVALTest.java b/src/test/function/builtin/EVALTest.java
index ae0fe66..053eb28 100644
--- a/src/test/function/builtin/EVALTest.java
+++ b/src/test/function/builtin/EVALTest.java
@@ -43,7 +43,6 @@ public class EVALTest extends SymbolAndFunctionCleaner {
         String input = "(let ((x 1)) (eval '(+ x 1)))";
 
         assertSExpressionsMatch(parseString("2"), evaluateString(input));
-
     }
 
     @Test
@@ -195,7 +194,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(let ((n 200)) (begin 1 2 3 y))");
             fail("expected exception");
-        } catch (UndefinedSymbolException e) {}
+        } catch (UndefinedSymbolException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -208,7 +208,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
             evaluateString("(defun test (n) (begin 1 2 3 y))");
             evaluateString("(test 200)");
             fail("expected exception");
-        } catch (UndefinedSymbolException e) {}
+        } catch (UndefinedSymbolException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -220,7 +221,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("((lambda (n) (begin 1 2 3 y)) 200)");
             fail("expected exception");
-        } catch (UndefinedSymbolException e) {}
+        } catch (UndefinedSymbolException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -233,7 +235,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
             evaluateString("(defun tail-recursive (n) (begin (recur) 2))");
             evaluateString("(tail-recursive 200)");
             fail("expected exception");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -246,7 +249,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
             evaluateString("(defun tail-recursive (n) (begin (recur) 2))");
             evaluateString("(apply 'tail-recursive '(200))");
             fail("expected exception");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
diff --git a/src/test/function/builtin/EXITTest.java b/src/test/function/builtin/EXITTest.java
index 491dfbd..30569a5 100644
--- a/src/test/function/builtin/EXITTest.java
+++ b/src/test/function/builtin/EXITTest.java
@@ -58,5 +58,4 @@ public class EXITTest extends SymbolAndFunctionCleaner {
     public void exitWithTooManyArguments() {
         evaluateString("(exit 1)");
     }
-
 }
diff --git a/src/test/function/builtin/FUNCALLTest.java b/src/test/function/builtin/FUNCALLTest.java
index be3c329..9dc4057 100644
--- a/src/test/function/builtin/FUNCALLTest.java
+++ b/src/test/function/builtin/FUNCALLTest.java
@@ -38,5 +38,4 @@ public class FUNCALLTest extends SymbolAndFunctionCleaner {
     public void funcallWithTooFewArguments() {
         evaluateString("(funcall)");
     }
-
 }
diff --git a/src/test/function/builtin/GENSYMTest.java b/src/test/function/builtin/GENSYMTest.java
index 780519e..b196096 100644
--- a/src/test/function/builtin/GENSYMTest.java
+++ b/src/test/function/builtin/GENSYMTest.java
@@ -40,5 +40,4 @@ public class GENSYMTest extends SymbolAndFunctionCleaner {
     public void gensymWithTooManyArguments() {
         evaluateString("(gensym 1)");
     }
-
 }
diff --git a/src/test/function/builtin/LOADTest.java b/src/test/function/builtin/LOADTest.java
index a393004..df900da 100644
--- a/src/test/function/builtin/LOADTest.java
+++ b/src/test/function/builtin/LOADTest.java
@@ -132,5 +132,4 @@ public class LOADTest extends SymbolAndFunctionCleaner {
         assertT(evaluateString(input));
         assertNothingPrinted();
     }
-
 }
diff --git a/src/test/function/builtin/PRINTTest.java b/src/test/function/builtin/PRINTTest.java
index 7f70925..97d59e1 100644
--- a/src/test/function/builtin/PRINTTest.java
+++ b/src/test/function/builtin/PRINTTest.java
@@ -64,5 +64,4 @@ public class PRINTTest extends SymbolAndFunctionCleaner {
     public void printWithTooFewArguments() {
         evaluateString("(print)");
     }
-
 }
diff --git a/src/test/function/builtin/SETTest.java b/src/test/function/builtin/SETTest.java
index 9b31bf9..524b6e5 100644
--- a/src/test/function/builtin/SETTest.java
+++ b/src/test/function/builtin/SETTest.java
@@ -81,5 +81,4 @@ public class SETTest extends SymbolAndFunctionCleaner {
     public void setWithTooManyArguments() {
         evaluateString("(set 'a 'b 'c)");
     }
-
 }
diff --git a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
index 2c85807..ef53fb4 100644
--- a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
+++ b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
@@ -70,5 +70,4 @@ public class SYMBOL_FUNCTIONTest extends SymbolAndFunctionCleaner {
         assertNotNull(e.getMessage());
         assertTrue(e.getMessage().length() > 0);
     }
-
 }
diff --git a/src/test/function/builtin/cons/CONSTest.java b/src/test/function/builtin/cons/CONSTest.java
index 5ba1014..2299b74 100644
--- a/src/test/function/builtin/cons/CONSTest.java
+++ b/src/test/function/builtin/cons/CONSTest.java
@@ -58,5 +58,4 @@ public class CONSTest extends SymbolAndFunctionCleaner {
     public void consWithTooFewArguments() {
         evaluateString("(cons 1)");
     }
-
 }
diff --git a/src/test/function/builtin/cons/FIRSTTest.java b/src/test/function/builtin/cons/FIRSTTest.java
index e85bf77..89cdeec 100644
--- a/src/test/function/builtin/cons/FIRSTTest.java
+++ b/src/test/function/builtin/cons/FIRSTTest.java
@@ -55,5 +55,4 @@ public class FIRSTTest extends SymbolAndFunctionCleaner {
     public void firstWithTooFewArguments() {
         evaluateString("(first)");
     }
-
 }
diff --git a/src/test/function/builtin/cons/LENGTHTest.java b/src/test/function/builtin/cons/LENGTHTest.java
index f2acc3d..f46ebf7 100644
--- a/src/test/function/builtin/cons/LENGTHTest.java
+++ b/src/test/function/builtin/cons/LENGTHTest.java
@@ -54,5 +54,4 @@ public class LENGTHTest extends SymbolAndFunctionCleaner {
     public void lengthWithDottedList() {
         evaluateString("(length (cons 1 2))");
     }
-
 }
diff --git a/src/test/function/builtin/cons/LISTTest.java b/src/test/function/builtin/cons/LISTTest.java
index 84c1de3..52b6975 100644
--- a/src/test/function/builtin/cons/LISTTest.java
+++ b/src/test/function/builtin/cons/LISTTest.java
@@ -57,5 +57,4 @@ public class LISTTest extends SymbolAndFunctionCleaner {
     public void staticMakeList() {
         assertSExpressionsMatch(parseString("(22)"), makeList(parseString("22")));
     }
-
 }
diff --git a/src/test/function/builtin/cons/RESTTest.java b/src/test/function/builtin/cons/RESTTest.java
index ffe983c..90dcf29 100644
--- a/src/test/function/builtin/cons/RESTTest.java
+++ b/src/test/function/builtin/cons/RESTTest.java
@@ -55,5 +55,4 @@ public class RESTTest extends SymbolAndFunctionCleaner {
     public void restWithTooFewArguments() {
         evaluateString("(rest)");
     }
-
 }
diff --git a/src/test/function/builtin/math/DIVIDETest.java b/src/test/function/builtin/math/DIVIDETest.java
index 92208e1..087ddc5 100644
--- a/src/test/function/builtin/math/DIVIDETest.java
+++ b/src/test/function/builtin/math/DIVIDETest.java
@@ -75,5 +75,4 @@ public class DIVIDETest extends SymbolAndFunctionCleaner {
     public void divideByZeroException_HasCorrectAttributes() {
         assertIsErrorWithMessage(new DivideByZeroException());
     }
-
 }
diff --git a/src/test/function/builtin/math/MINUSTest.java b/src/test/function/builtin/math/MINUSTest.java
index 8b8802b..41a2937 100644
--- a/src/test/function/builtin/math/MINUSTest.java
+++ b/src/test/function/builtin/math/MINUSTest.java
@@ -49,5 +49,4 @@ public class MINUSTest extends SymbolAndFunctionCleaner {
     public void minusWithTooFewArguments() {
         evaluateString("(-)");
     }
-
 }
diff --git a/src/test/function/builtin/math/MULTIPLYTest.java b/src/test/function/builtin/math/MULTIPLYTest.java
index 2a92dd6..c32fc6d 100644
--- a/src/test/function/builtin/math/MULTIPLYTest.java
+++ b/src/test/function/builtin/math/MULTIPLYTest.java
@@ -50,5 +50,4 @@ public class MULTIPLYTest extends SymbolAndFunctionCleaner {
     public void multiplyWithNonNumber() {
         evaluateString("(* 'a 'b)");
     }
-
 }
diff --git a/src/test/function/builtin/math/PLUSTest.java b/src/test/function/builtin/math/PLUSTest.java
index 33f56a7..47833f1 100644
--- a/src/test/function/builtin/math/PLUSTest.java
+++ b/src/test/function/builtin/math/PLUSTest.java
@@ -50,5 +50,4 @@ public class PLUSTest extends SymbolAndFunctionCleaner {
     public void plusWithNonNumber() {
         evaluateString("(+ 'a 'b)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/ATOMTest.java b/src/test/function/builtin/predicate/ATOMTest.java
index efd33b5..3e07bcf 100644
--- a/src/test/function/builtin/predicate/ATOMTest.java
+++ b/src/test/function/builtin/predicate/ATOMTest.java
@@ -36,5 +36,4 @@ public class ATOMTest extends SymbolAndFunctionCleaner {
     public void testApplyWithTooFewArguments() {
         evaluateString("(atom)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/EQTest.java b/src/test/function/builtin/predicate/EQTest.java
index 7ff7b3b..92b9318 100644
--- a/src/test/function/builtin/predicate/EQTest.java
+++ b/src/test/function/builtin/predicate/EQTest.java
@@ -110,5 +110,4 @@ public class EQTest extends SymbolAndFunctionCleaner {
     public void eqWithTooFewArguments() {
         evaluateString("(eq 'one)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/EQUALTest.java b/src/test/function/builtin/predicate/EQUALTest.java
index 0190836..7c537d5 100644
--- a/src/test/function/builtin/predicate/EQUALTest.java
+++ b/src/test/function/builtin/predicate/EQUALTest.java
@@ -112,5 +112,4 @@ public class EQUALTest extends SymbolAndFunctionCleaner {
     public void equalWithTooFewArguments() {
         evaluateString("(equal 1)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
index 623b07a..fc85965 100644
--- a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
+++ b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
@@ -158,5 +158,4 @@ public class GENSYM_EQUALTest extends SymbolAndFunctionCleaner {
 
         assertNil(evaluateString(input));
     }
-
 }
diff --git a/src/test/function/builtin/predicate/LISTPTest.java b/src/test/function/builtin/predicate/LISTPTest.java
index f7dc56e..b06ebaf 100644
--- a/src/test/function/builtin/predicate/LISTPTest.java
+++ b/src/test/function/builtin/predicate/LISTPTest.java
@@ -36,5 +36,4 @@ public class LISTPTest extends SymbolAndFunctionCleaner {
     public void listpWithTooManyArguments() {
         evaluateString("(listp '() '())");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NULLTest.java b/src/test/function/builtin/predicate/NULLTest.java
index 128394e..29825c9 100644
--- a/src/test/function/builtin/predicate/NULLTest.java
+++ b/src/test/function/builtin/predicate/NULLTest.java
@@ -36,5 +36,4 @@ public class NULLTest extends SymbolAndFunctionCleaner {
     public void testNullWithTooManyArguments() {
         evaluateString("(null 1 2)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
index 21bb8cc..69a5244 100644
--- a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
@@ -56,5 +56,4 @@ public class NUMERIC_EQUALTest extends SymbolAndFunctionCleaner {
     public void numericEqualWithTooFewArguments() {
         evaluateString("(=)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
index 6867176..05ddda5 100644
--- a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
@@ -56,5 +56,4 @@ public class NUMERIC_GREATERTest extends SymbolAndFunctionCleaner {
     public void greaterThanWithTooFewArguments() {
         evaluateString("(>)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
index 48d3e91..7721ef3 100644
--- a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
@@ -56,5 +56,4 @@ public class NUMERIC_LESSTest extends SymbolAndFunctionCleaner {
     public void lessThanWithTooFewArguments() {
         evaluateString("(<)");
     }
-
 }
diff --git a/src/test/function/builtin/special/ANDTest.java b/src/test/function/builtin/special/ANDTest.java
index d995e0e..42b2034 100644
--- a/src/test/function/builtin/special/ANDTest.java
+++ b/src/test/function/builtin/special/ANDTest.java
@@ -62,5 +62,4 @@ public class ANDTest extends SymbolAndFunctionCleaner {
         assertNil(evaluateString(input));
         evaluateString("x");
     }
-
 }
diff --git a/src/test/function/builtin/special/CASETest.java b/src/test/function/builtin/special/CASETest.java
index 5a8bb20..1b0c610 100644
--- a/src/test/function/builtin/special/CASETest.java
+++ b/src/test/function/builtin/special/CASETest.java
@@ -194,5 +194,4 @@ public class CASETest extends SymbolAndFunctionCleaner {
     public void caseWithNilClause() {
         evaluateString("(case :a nil)");
     }
-
 }
diff --git a/src/test/function/builtin/special/CONDTest.java b/src/test/function/builtin/special/CONDTest.java
index 84856b2..db0ef3e 100644
--- a/src/test/function/builtin/special/CONDTest.java
+++ b/src/test/function/builtin/special/CONDTest.java
@@ -94,5 +94,4 @@ public class CONDTest extends SymbolAndFunctionCleaner {
     public void condWithDottedArgumentList_ThrowsException() {
         evaluateString("(apply 'cond (cons '(nil T) 'b))");
     }
-
 }
diff --git a/src/test/function/builtin/special/DEFINE_SPECIALTest.java b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
index 8b2fa9a..11953b5 100644
--- a/src/test/function/builtin/special/DEFINE_SPECIALTest.java
+++ b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
@@ -186,5 +186,4 @@ public class DEFINE_SPECIALTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(parseString("grains"), evaluateString("x"));
     }
-
 }
diff --git a/src/test/function/builtin/special/DEFMACROTest.java b/src/test/function/builtin/special/DEFMACROTest.java
index b59eeba..f62d565 100644
--- a/src/test/function/builtin/special/DEFMACROTest.java
+++ b/src/test/function/builtin/special/DEFMACROTest.java
@@ -187,5 +187,4 @@ public class DEFMACROTest extends SymbolAndFunctionCleaner {
         evaluateString("(defmacro m (x) `'(+ 2 ,x))");
         assertSExpressionsMatch(parseString("(+ 2 25)"), evaluateString("(m 25)"));
     }
-
 }
diff --git a/src/test/function/builtin/special/DEFUNTest.java b/src/test/function/builtin/special/DEFUNTest.java
index ba7c68c..593099d 100644
--- a/src/test/function/builtin/special/DEFUNTest.java
+++ b/src/test/function/builtin/special/DEFUNTest.java
@@ -185,5 +185,4 @@ public class DEFUNTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(parseString("grains"), evaluateString("x"));
     }
-
 }
diff --git a/src/test/function/builtin/special/IFTest.java b/src/test/function/builtin/special/IFTest.java
index ac19398..478b3d0 100644
--- a/src/test/function/builtin/special/IFTest.java
+++ b/src/test/function/builtin/special/IFTest.java
@@ -73,5 +73,4 @@ public class IFTest extends SymbolAndFunctionCleaner {
     public void ifWithTooManyArguments() {
         evaluateString("(if t t t t)");
     }
-
 }
diff --git a/src/test/function/builtin/special/LAMBDATest.java b/src/test/function/builtin/special/LAMBDATest.java
index d7b4883..4cfd4fd 100644
--- a/src/test/function/builtin/special/LAMBDATest.java
+++ b/src/test/function/builtin/special/LAMBDATest.java
@@ -147,5 +147,4 @@ public class LAMBDATest extends SymbolAndFunctionCleaner {
         assertSExpressionsMatch(parseString("3"), evaluateString("(funcall increment-count)"));
         assertSExpressionsMatch(parseString("4"), evaluateString("(funcall increment-count)"));
     }
-
 }
diff --git a/src/test/function/builtin/special/LETTest.java b/src/test/function/builtin/special/LETTest.java
index 8646c05..728b6c6 100644
--- a/src/test/function/builtin/special/LETTest.java
+++ b/src/test/function/builtin/special/LETTest.java
@@ -157,5 +157,4 @@ public class LETTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(new LispNumber("2"), evaluateString(input));
     }
-
 }
diff --git a/src/test/function/builtin/special/LET_STARTest.java b/src/test/function/builtin/special/LET_STARTest.java
index e00a8d9..d6bf683 100644
--- a/src/test/function/builtin/special/LET_STARTest.java
+++ b/src/test/function/builtin/special/LET_STARTest.java
@@ -157,5 +157,4 @@ public class LET_STARTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(new LispNumber("3"), evaluateString(input));
     }
-
 }
diff --git a/src/test/function/builtin/special/ORTest.java b/src/test/function/builtin/special/ORTest.java
index 3e57073..33beb92 100644
--- a/src/test/function/builtin/special/ORTest.java
+++ b/src/test/function/builtin/special/ORTest.java
@@ -62,5 +62,4 @@ public class ORTest extends SymbolAndFunctionCleaner {
         assertT(evaluateString(input));
         evaluateString("x");
     }
-
 }
diff --git a/src/test/function/builtin/special/PROGNTest.java b/src/test/function/builtin/special/PROGNTest.java
index 88ed0c1..3ba03e5 100644
--- a/src/test/function/builtin/special/PROGNTest.java
+++ b/src/test/function/builtin/special/PROGNTest.java
@@ -40,5 +40,4 @@ public class PROGNTest extends SymbolAndFunctionCleaner {
     public void prognWithDifferentArgumentTypes() {
         assertSExpressionsMatch(parseString("pear"), evaluateString("(progn t nil '(1 2) 'pear)"));
     }
-
 }
diff --git a/src/test/function/builtin/special/QUOTETest.java b/src/test/function/builtin/special/QUOTETest.java
index e93ef55..7acbf40 100644
--- a/src/test/function/builtin/special/QUOTETest.java
+++ b/src/test/function/builtin/special/QUOTETest.java
@@ -35,5 +35,4 @@ public class QUOTETest extends SymbolAndFunctionCleaner {
     public void quoteWithTooManyArguments() {
         evaluateString("(quote a b)");
     }
-
 }
diff --git a/src/test/function/builtin/special/RECURTest.java b/src/test/function/builtin/special/RECURTest.java
index e4ed2e1..cd7fd5d 100644
--- a/src/test/function/builtin/special/RECURTest.java
+++ b/src/test/function/builtin/special/RECURTest.java
@@ -116,7 +116,8 @@ public class RECURTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(bad-tail-recursive 900)");
             fail("expectedException");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("PASS"), evaluateString("(tail-recursive 900)"));
     }
@@ -129,7 +130,8 @@ public class RECURTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(bad-tail-recursive 900)");
             fail("expectedException");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("PASS"), evaluateString("(tail-recursive 900)"));
     }
@@ -142,7 +144,8 @@ public class RECURTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(bad-tail-recursive 900)");
             fail("expectedException");
-        } catch (NestedRecurException e) {}
+        } catch (NestedRecurException e) {
+        }
 
         assertSExpressionsMatch(parseString("PASS"), evaluateString("(tail-recursive 900)"));
     }
@@ -187,5 +190,4 @@ public class RECURTest extends SymbolAndFunctionCleaner {
     public void recurNotInTailPositionException_HasCorrectAttributes() {
         assertIsErrorWithMessage(new RecurNotInTailPositionException());
     }
-
 }
diff --git a/src/test/function/builtin/special/SETQTest.java b/src/test/function/builtin/special/SETQTest.java
index 90aad00..f09f243 100644
--- a/src/test/function/builtin/special/SETQTest.java
+++ b/src/test/function/builtin/special/SETQTest.java
@@ -92,5 +92,4 @@ public class SETQTest extends SymbolAndFunctionCleaner {
     public void setqWithTooManyArguments() {
         evaluateString("(setq a b c)");
     }
-
 }
diff --git a/src/test/interpreter/LispInterpreterTest.java b/src/test/interpreter/LispInterpreterTest.java
index 913d28a..9a69064 100644
--- a/src/test/interpreter/LispInterpreterTest.java
+++ b/src/test/interpreter/LispInterpreterTest.java
@@ -193,5 +193,4 @@ public class LispInterpreterTest {
         assertEquals("\n", outputStream.toString());
         assertEquals("[error] symbol PICKLE has no value\n", errorOutputStream.toString());
     }
-
 }
diff --git a/src/test/parser/LispParserTest.java b/src/test/parser/LispParserTest.java
index 945f9e7..ec47957 100644
--- a/src/test/parser/LispParserTest.java
+++ b/src/test/parser/LispParserTest.java
@@ -304,7 +304,8 @@ public class LispParserTest {
         try {
             parser.getNextSExpression();
             fail("Expected LispException");
-        } catch (LispException e) {}
+        } catch (LispException e) {
+        }
 
         assertTrue(parser.isEof());
     }
@@ -378,5 +379,4 @@ public class LispParserTest {
         assertAtSignExpression(parser.getNextSExpression());
         assertTrue(parser.isEof());
     }
-
 }
diff --git a/src/test/recursion/TailCallTest.java b/src/test/recursion/TailCallTest.java
index c192067..b3a9466 100644
--- a/src/test/recursion/TailCallTest.java
+++ b/src/test/recursion/TailCallTest.java
@@ -28,5 +28,4 @@ public class TailCallTest {
     public void TailCallsCoverage() {
         new TailCalls();
     }
-
 }
diff --git a/src/test/scanner/LispCommentRemovingInputStreamTest.java b/src/test/scanner/LispCommentRemovingInputStreamTest.java
index 7d4d6e7..60150cb 100644
--- a/src/test/scanner/LispCommentRemovingInputStreamTest.java
+++ b/src/test/scanner/LispCommentRemovingInputStreamTest.java
@@ -226,5 +226,4 @@ public class LispCommentRemovingInputStreamTest {
 
         assertEquals(expectedResult, getLispCommentRemovingInputStreamResult(input));
     }
-
 }
diff --git a/src/test/scanner/LispScannerLineColumnTest.java b/src/test/scanner/LispScannerLineColumnTest.java
index 78d55b8..0bba8dd 100644
--- a/src/test/scanner/LispScannerLineColumnTest.java
+++ b/src/test/scanner/LispScannerLineColumnTest.java
@@ -134,5 +134,4 @@ public class LispScannerLineColumnTest {
 
         assertTokenLineAndColumnsMatch(input, expectedLinesAndColumns);
     }
-
 }
diff --git a/src/test/scanner/LispScannerTextTest.java b/src/test/scanner/LispScannerTextTest.java
index 42ab768..11c9344 100644
--- a/src/test/scanner/LispScannerTextTest.java
+++ b/src/test/scanner/LispScannerTextTest.java
@@ -114,5 +114,4 @@ public class LispScannerTextTest {
 
         assertTokenTextMatches(input, expected);
     }
-
 }
diff --git a/src/test/scanner/LispScannerTypeTest.java b/src/test/scanner/LispScannerTypeTest.java
index 58078d7..4365913 100644
--- a/src/test/scanner/LispScannerTypeTest.java
+++ b/src/test/scanner/LispScannerTypeTest.java
@@ -306,5 +306,4 @@ public class LispScannerTypeTest {
 
         assertTokenTypesMatch(input);
     }
-
 }
diff --git a/src/test/sexpression/SExpressionTest.java b/src/test/sexpression/SExpressionTest.java
index 49be3a6..8d08874 100644
--- a/src/test/sexpression/SExpressionTest.java
+++ b/src/test/sexpression/SExpressionTest.java
@@ -221,5 +221,4 @@ public class SExpressionTest {
 
         assertSExpressionsMatch(expression, atSign.getExpression());
     }
-
 }
diff --git a/src/test/stream/SafeInputStreamTest.java b/src/test/stream/SafeInputStreamTest.java
index 4be1d9c..e20c378 100644
--- a/src/test/stream/SafeInputStreamTest.java
+++ b/src/test/stream/SafeInputStreamTest.java
@@ -38,5 +38,4 @@ public class SafeInputStreamTest {
     public void closeThrowsUncheckedException() {
         safeWithException.close();
     }
-
 }
diff --git a/src/test/stream/SafeOutputStreamTest.java b/src/test/stream/SafeOutputStreamTest.java
index 1fc4269..c181691 100644
--- a/src/test/stream/SafeOutputStreamTest.java
+++ b/src/test/stream/SafeOutputStreamTest.java
@@ -51,5 +51,4 @@ public class SafeOutputStreamTest {
     public void closeThrowsUncheckedException() {
         safeWithException.close();
     }
-
 }
diff --git a/src/test/table/ExecutionContextTest.java b/src/test/table/ExecutionContextTest.java
index 9dacbfc..068dbe4 100644
--- a/src/test/table/ExecutionContextTest.java
+++ b/src/test/table/ExecutionContextTest.java
@@ -99,5 +99,4 @@ public class ExecutionContextTest {
         assertThat(executionContext.getScope().isGlobal(), is(true));
         assertThat(executionContext.getScope(), is(global));
     }
-
 }
diff --git a/src/test/table/FunctionTableTest.java b/src/test/table/FunctionTableTest.java
index 254d023..ec1aec0 100644
--- a/src/test/table/FunctionTableTest.java
+++ b/src/test/table/FunctionTableTest.java
@@ -160,5 +160,4 @@ public class FunctionTableTest {
         assertFalse(isAlreadyDefined("UGLY"));
         assertNull(lookupFunction("UGLY"));
     }
-
 }
diff --git a/src/test/table/SymbolTableTest.java b/src/test/table/SymbolTableTest.java
index 778ed9a..444585a 100644
--- a/src/test/table/SymbolTableTest.java
+++ b/src/test/table/SymbolTableTest.java
@@ -60,5 +60,4 @@ public class SymbolTableTest {
 
         assertEquals(T, parentTable.get("symbol"));
     }
-
 }
diff --git a/src/test/terminal/ControlSequenceHandlerTest.java b/src/test/terminal/ControlSequenceHandlerTest.java
index df29227..ec40094 100644
--- a/src/test/terminal/ControlSequenceHandlerTest.java
+++ b/src/test/terminal/ControlSequenceHandlerTest.java
@@ -132,5 +132,4 @@ public class ControlSequenceHandlerTest {
         assertThat(handler.parse(input), is(GREEN));
         assertThat(handler.parse(input), is(RESET));
     }
-
 }
diff --git a/src/test/terminal/ControlSequenceTest.java b/src/test/terminal/ControlSequenceTest.java
index f99132d..d24a195 100644
--- a/src/test/terminal/ControlSequenceTest.java
+++ b/src/test/terminal/ControlSequenceTest.java
@@ -100,5 +100,4 @@ public class ControlSequenceTest {
         for (SelectGraphicRendition sgr : SelectGraphicRendition.values())
             SelectGraphicRendition.valueOf(sgr.toString());
     }
-
 }
diff --git a/src/test/terminal/FlushListener.java b/src/test/terminal/FlushListener.java
index 8d7c377..7e85885 100644
--- a/src/test/terminal/FlushListener.java
+++ b/src/test/terminal/FlushListener.java
@@ -34,5 +34,4 @@ public class FlushListener implements VirtualTerminalListener {
 
     @Override
     public void onClose() {}
-
 }
\ No newline at end of file
diff --git a/src/test/terminal/LispTerminalTest.java b/src/test/terminal/LispTerminalTest.java
index 2892d36..d4c3d5d 100644
--- a/src/test/terminal/LispTerminalTest.java
+++ b/src/test/terminal/LispTerminalTest.java
@@ -491,5 +491,4 @@ public class LispTerminalTest {
         terminal.assertScreenText(" ");
         terminal.assertCursorPosition(0, 0);
     }
-
 }
diff --git a/src/test/terminal/TerminalConfigurationTest.java b/src/test/terminal/TerminalConfigurationTest.java
index 9da9f08..6909c05 100644
--- a/src/test/terminal/TerminalConfigurationTest.java
+++ b/src/test/terminal/TerminalConfigurationTest.java
@@ -37,5 +37,4 @@ public class TerminalConfigurationTest {
     public void setOutputPairThrowsUncheckedException() {
         configuration.setOutputPair(createIOExceptionThrowingPipedOutputStream(), new PipedInputStream());
     }
-
 }
diff --git a/src/test/terminal/TerminalHistoryTest.java b/src/test/terminal/TerminalHistoryTest.java
index 784d4b0..dae6410 100644
--- a/src/test/terminal/TerminalHistoryTest.java
+++ b/src/test/terminal/TerminalHistoryTest.java
@@ -136,5 +136,4 @@ public class TerminalHistoryTest {
 
         assertNext("current");
     }
-
 }
diff --git a/src/test/terminal/VirtualTerminalInteractor.java b/src/test/terminal/VirtualTerminalInteractor.java
index fac6c91..f605cd5 100644
--- a/src/test/terminal/VirtualTerminalInteractor.java
+++ b/src/test/terminal/VirtualTerminalInteractor.java
@@ -108,7 +108,8 @@ public class VirtualTerminalInteractor {
             outputWriter.write(END_OF_SEGMENT);
             outputWriter.flush();
             waitForFlushes(1);
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
     }
 
     public void waitForFlushes(int flushCount) {
@@ -119,7 +120,8 @@ public class VirtualTerminalInteractor {
 
                 flushListener.reduceFlushCount(flushCount);
             }
-        } catch (InterruptedException ignored) {}
+        } catch (InterruptedException ignored) {
+        }
     }
 
     public void waitForPrompt() {
@@ -162,7 +164,8 @@ public class VirtualTerminalInteractor {
 
             for (int c = inputReader.read(); c != -1; c = inputReader.read())
                 actual += (char) c;
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
 
         assertThat(actual, is(expected));
     }
@@ -171,7 +174,7 @@ public class VirtualTerminalInteractor {
         try {
             inputWriter.write(0);
             fail("input stream not closed");
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
     }
-
 }
diff --git a/src/test/testutil/SymbolAndFunctionCleaner.java b/src/test/testutil/SymbolAndFunctionCleaner.java
index 3181ea0..e04e4cf 100644
--- a/src/test/testutil/SymbolAndFunctionCleaner.java
+++ b/src/test/testutil/SymbolAndFunctionCleaner.java
@@ -32,5 +32,4 @@ public abstract class SymbolAndFunctionCleaner {
     public void additionalSetUp() {}
 
     public void additionalTearDown() {}
-
 }
diff --git a/src/test/testutil/TestUtilities.java b/src/test/testutil/TestUtilities.java
index fd833d6..8ba750a 100644
--- a/src/test/testutil/TestUtilities.java
+++ b/src/test/testutil/TestUtilities.java
@@ -96,5 +96,4 @@ public final class TestUtilities {
         assertThat(e.getSeverity(), is(ERROR));
         assertThat(e.getMessage(), not(isEmptyOrNullString()));
     }
-
 }
diff --git a/src/test/testutil/TypeAssertions.java b/src/test/testutil/TypeAssertions.java
index c18bc7c..3dc5bf9 100644
--- a/src/test/testutil/TypeAssertions.java
+++ b/src/test/testutil/TypeAssertions.java
@@ -126,5 +126,4 @@ public final class TypeAssertions {
         assertThat(sExpression.isComma(), is(false));
         assertThat(sExpression.isAtSign(), is(true));
     }
-
 }
diff --git a/src/test/token/TokenFactoryTest.java b/src/test/token/TokenFactoryTest.java
index 1bdad5f..b7bd7fe 100644
--- a/src/test/token/TokenFactoryTest.java
+++ b/src/test/token/TokenFactoryTest.java
@@ -123,5 +123,4 @@ public class TokenFactoryTest {
         String text = "@";
         assertThat(createToken(text), instanceOf(AtSign.class));
     }
-
 }
diff --git a/src/test/util/CharactersTest.java b/src/test/util/CharactersTest.java
index 948226d..fd5338a 100644
--- a/src/test/util/CharactersTest.java
+++ b/src/test/util/CharactersTest.java
@@ -18,5 +18,4 @@ public class CharactersTest {
         constructor.setAccessible(true);
         constructor.newInstance();
     }
-
 }
diff --git a/src/test/util/PathTest.java b/src/test/util/PathTest.java
index b97b74b..5b16a5c 100644
--- a/src/test/util/PathTest.java
+++ b/src/test/util/PathTest.java
@@ -18,5 +18,4 @@ public class PathTest {
         constructor.setAccessible(true);
         constructor.newInstance();
     }
-
 }

From bd7df920fa843b7ca48dc97801bf8a5ae454c775 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 10:02:52 -0400
Subject: [PATCH 05/16] Update import arrangement

---
 .idea/codeStyles/Project.xml                  | 13 ++++++++
 src/main/application/LispMain.java            | 25 +++++++--------
 src/main/environment/RuntimeEnvironment.java  |  4 +--
 .../error/CriticalLineColumnException.java    |  4 +--
 src/main/error/CriticalLispException.java     |  4 +--
 src/main/error/ErrorManager.java              |  8 ++---
 src/main/error/LineColumnException.java       |  4 +--
 src/main/error/LispException.java             |  4 +--
 src/main/error/LispWarning.java               |  4 +--
 src/main/function/ArgumentValidator.java      | 10 +++---
 src/main/function/UserDefinedFunction.java    | 14 ++++----
 src/main/function/builtin/APPLY.java          |  8 ++---
 .../function/builtin/BackquoteEvaluator.java  |  6 ++--
 src/main/function/builtin/EVAL.java           | 16 +++++-----
 src/main/function/builtin/EXIT.java           |  4 +--
 src/main/function/builtin/FUNCALL.java        |  6 ++--
 src/main/function/builtin/GENSYM.java         |  4 +--
 src/main/function/builtin/LOAD.java           | 20 ++++++------
 src/main/function/builtin/SET.java            |  4 +--
 .../function/builtin/SYMBOL_FUNCTION.java     |  6 ++--
 src/main/function/builtin/cons/APPEND.java    |  6 ++--
 src/main/function/builtin/cons/LENGTH.java    | 14 ++++----
 src/main/function/builtin/cons/LIST.java      |  4 +--
 src/main/function/builtin/math/DIVIDE.java    |  4 +--
 src/main/function/builtin/math/MINUS.java     |  4 +--
 src/main/function/builtin/math/MULTIPLY.java  |  4 +--
 .../function/builtin/math/MathFunction.java   | 12 +++----
 src/main/function/builtin/math/PLUS.java      |  4 +--
 src/main/function/builtin/predicate/ATOM.java |  6 ++--
 src/main/function/builtin/predicate/EQ.java   |  6 ++--
 .../function/builtin/predicate/EQUAL.java     |  6 ++--
 .../builtin/predicate/GENSYM_EQUAL.java       | 16 +++++-----
 .../function/builtin/predicate/LISTP.java     |  6 ++--
 src/main/function/builtin/predicate/NULL.java |  6 ++--
 .../builtin/predicate/NUMERIC_EQUAL.java      | 10 +++---
 .../builtin/predicate/NUMERIC_GREATER.java    | 10 +++---
 .../builtin/predicate/NUMERIC_LESS.java       | 10 +++---
 src/main/function/builtin/special/AND.java    | 10 +++---
 src/main/function/builtin/special/CASE.java   | 14 ++++----
 src/main/function/builtin/special/COND.java   | 10 +++---
 src/main/function/builtin/special/Define.java | 10 +++---
 src/main/function/builtin/special/IF.java     |  4 +--
 src/main/function/builtin/special/LAMBDA.java |  4 +--
 src/main/function/builtin/special/LET.java    |  6 ++--
 src/main/function/builtin/special/OR.java     |  8 ++---
 src/main/function/builtin/special/PROGN.java  | 10 +++---
 src/main/function/builtin/special/RECUR.java  |  4 +--
 src/main/function/builtin/special/SETQ.java   |  8 ++---
 src/main/interpreter/LispInterpreter.java     | 10 +++---
 .../LispInterpreterBuilderImpl.java           | 10 +++---
 src/main/parser/LispParser.java               |  4 +--
 src/main/recursion/TailCall.java              |  4 ---
 .../LispCommentRemovingInputStream.java       |  8 ++---
 src/main/scanner/LispScanner.java             | 22 ++++++-------
 src/main/sexpression/Cons.java                |  4 +--
 src/main/sexpression/LispNumber.java          |  4 +--
 src/main/stream/SafeInputStream.java          |  4 +--
 src/main/stream/UncheckedIOException.java     |  4 +--
 src/main/table/ExecutionContext.java          |  8 ++---
 src/main/table/FunctionTable.java             | 14 ++++----
 src/main/table/SymbolTable.java               | 12 +++----
 src/main/terminal/ControlSequenceHandler.java |  4 +--
 src/main/terminal/ControlSequenceLookup.java  |  4 +--
 src/main/terminal/LispTerminal.java           | 25 +++++++--------
 src/main/terminal/TerminalConfiguration.java  |  7 ++--
 src/main/token/AtSign.java                    |  4 +--
 src/main/token/Backquote.java                 |  4 +--
 src/main/token/Comma.java                     |  4 +--
 src/main/token/Eof.java                       |  4 +--
 src/main/token/Identifier.java                |  4 +--
 src/main/token/LeftParenthesis.java           |  4 +--
 src/main/token/Number.java                    |  4 +--
 src/main/token/QuoteMark.java                 |  8 ++---
 src/main/token/QuotedString.java              |  4 +--
 src/main/token/RightParenthesis.java          | 10 +++---
 src/main/token/Token.java                     | 10 +++---
 src/main/token/TokenFactory.java              |  4 +--
 src/main/token/TokenFactoryImpl.java          |  4 +--
 src/test/acceptance/AcceptanceTest.java       |  3 +-
 .../fixture/LispInterpreterFixture.java       | 16 +++++-----
 src/test/application/MainTest.java            | 32 +++++++++----------
 .../environment/RuntimeEnvironmentTest.java   | 17 +++++-----
 src/test/error/ErrorManagerTest.java          | 21 ++++++------
 src/test/file/FilePositionTrackerTest.java    |  8 ++---
 src/test/function/ArgumentValidatorTest.java  | 25 +++++++--------
 src/test/function/LispFunctionTest.java       |  5 ++-
 .../function/LispSpecialFunctionTest.java     |  5 ++-
 .../function/UserDefinedFunctionTest.java     | 21 ++++++------
 src/test/function/builtin/APPLYTest.java      | 13 ++++----
 .../builtin/BackquoteEvaluatorTest.java       | 15 ++++-----
 src/test/function/builtin/EVALTest.java       | 21 ++++++------
 src/test/function/builtin/EXITTest.java       | 15 ++++-----
 src/test/function/builtin/FUNCALLTest.java    |  9 +++---
 src/test/function/builtin/GENSYMTest.java     | 11 +++----
 src/test/function/builtin/LOADTest.java       | 19 ++++++-----
 src/test/function/builtin/PRINTTest.java      | 17 +++++-----
 src/test/function/builtin/SETTest.java        | 11 +++----
 src/test/function/builtin/SYMBOLSTest.java    |  9 +++---
 .../function/builtin/SYMBOL_FUNCTIONTest.java | 15 ++++-----
 .../function/builtin/cons/APPENDTest.java     | 11 +++----
 src/test/function/builtin/cons/CONSTest.java  | 15 ++++-----
 src/test/function/builtin/cons/FIRSTTest.java | 11 +++----
 .../function/builtin/cons/LENGTHTest.java     | 11 +++----
 src/test/function/builtin/cons/LISTTest.java  |  7 ++--
 src/test/function/builtin/cons/RESTTest.java  | 11 +++----
 .../function/builtin/math/DIVIDETest.java     | 13 ++++----
 src/test/function/builtin/math/MINUSTest.java |  9 +++---
 .../function/builtin/math/MODULOTest.java     | 11 +++----
 .../function/builtin/math/MULTIPLYTest.java   | 11 +++----
 src/test/function/builtin/math/PLUSTest.java  | 11 +++----
 .../function/builtin/math/REMAINDERTest.java  |  9 +++---
 .../function/builtin/predicate/ATOMTest.java  | 11 +++----
 .../function/builtin/predicate/EQTest.java    | 11 +++----
 .../function/builtin/predicate/EQUALTest.java | 11 +++----
 .../builtin/predicate/GENSYM_EQUALTest.java   | 11 +++----
 .../function/builtin/predicate/LISTPTest.java | 11 +++----
 .../function/builtin/predicate/NULLTest.java  | 11 +++----
 .../builtin/predicate/NUMERIC_EQUALTest.java  | 11 +++----
 .../predicate/NUMERIC_GREATERTest.java        | 11 +++----
 .../builtin/predicate/NUMERIC_LESSTest.java   | 11 +++----
 .../function/builtin/special/ANDTest.java     | 11 +++----
 .../function/builtin/special/CASETest.java    | 11 +++----
 .../function/builtin/special/CONDTest.java    | 11 +++----
 .../builtin/special/DEFINE_SPECIALTest.java   | 19 ++++++-----
 .../builtin/special/DEFMACROTest.java         | 19 ++++++-----
 .../function/builtin/special/DEFUNTest.java   | 19 ++++++-----
 .../function/builtin/special/FUSETest.java    |  9 +++---
 src/test/function/builtin/special/IFTest.java | 11 +++----
 .../function/builtin/special/LAMBDATest.java  | 23 +++++++------
 .../function/builtin/special/LETTest.java     | 11 +++----
 .../builtin/special/LET_STARTest.java         | 11 +++----
 src/test/function/builtin/special/ORTest.java | 11 +++----
 .../function/builtin/special/PROGNTest.java   |  7 ++--
 .../function/builtin/special/QUOTETest.java   | 11 +++----
 .../function/builtin/special/RECURTest.java   | 15 ++++-----
 .../function/builtin/special/SETQTest.java    | 11 +++----
 src/test/interpreter/LispInterpreterTest.java | 23 +++++++------
 src/test/parser/LispParserTest.java           | 21 ++++++------
 src/test/recursion/TailCallTest.java          |  4 +--
 .../LispCommentRemovingInputStreamTest.java   | 13 ++++----
 .../scanner/LispScannerLineColumnTest.java    | 11 +++----
 src/test/scanner/LispScannerTextTest.java     |  9 +++---
 src/test/scanner/LispScannerTypeTest.java     | 21 ++++++------
 src/test/sexpression/SExpressionTest.java     | 15 ++++-----
 src/test/stream/SafeInputStreamTest.java      |  6 ++--
 src/test/stream/SafeOutputStreamTest.java     | 10 +++---
 src/test/table/ExecutionContextTest.java      |  8 ++---
 src/test/table/FunctionTableTest.java         | 27 ++++++++--------
 src/test/table/SymbolTableTest.java           |  6 ++--
 .../terminal/ControlSequenceHandlerTest.java  | 15 ++++-----
 src/test/terminal/ControlSequenceTest.java    | 22 ++++++-------
 src/test/terminal/LispTerminalTest.java       |  8 ++---
 .../terminal/TerminalConfigurationTest.java   |  9 +++---
 src/test/terminal/TerminalHistoryTest.java    |  6 ++--
 .../terminal/VirtualTerminalInteractor.java   | 19 ++++++-----
 .../testutil/SymbolAndFunctionCleaner.java    |  5 ++-
 src/test/testutil/TestUtilities.java          | 22 ++++++-------
 src/test/testutil/TypeAssertions.java         |  4 +--
 src/test/token/TokenFactoryTest.java          | 13 ++++----
 src/test/util/CharactersTest.java             |  6 ++--
 src/test/util/PathTest.java                   |  6 ++--
 161 files changed, 795 insertions(+), 861 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 63e4c92..a2d49a1 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,6 +4,19 @@
       <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
       <option name="ANNOTATION_PARAMETER_WRAP" value="5" />
       <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
     </JavaCodeStyleSettings>
     <XML>
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
diff --git a/src/main/application/LispMain.java b/src/main/application/LispMain.java
index 16640e5..119f88d 100644
--- a/src/main/application/LispMain.java
+++ b/src/main/application/LispMain.java
@@ -1,8 +1,14 @@
 package application;
 
-import static com.googlecode.lanterna.terminal.IOSafeTerminalAdapter.createRuntimeExceptionConvertingAdapter;
-import static java.text.MessageFormat.format;
-import static terminal.LispTerminal.END_OF_SEGMENT;
+import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
+import com.googlecode.lanterna.terminal.IOSafeTerminal;
+import com.googlecode.lanterna.terminal.Terminal;
+import interpreter.LispInterpreter;
+import interpreter.LispInterpreterBuilder;
+import interpreter.LispInterpreterBuilderImpl;
+import stream.UncheckedIOException;
+import terminal.LispTerminal;
+import terminal.TerminalConfiguration;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
@@ -10,16 +16,9 @@ import java.io.PipedOutputStream;
 import java.io.PrintStream;
 import java.util.function.Function;
 
-import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
-import com.googlecode.lanterna.terminal.IOSafeTerminal;
-import com.googlecode.lanterna.terminal.Terminal;
-
-import interpreter.LispInterpreter;
-import interpreter.LispInterpreterBuilder;
-import interpreter.LispInterpreterBuilderImpl;
-import stream.UncheckedIOException;
-import terminal.LispTerminal;
-import terminal.TerminalConfiguration;
+import static com.googlecode.lanterna.terminal.IOSafeTerminalAdapter.createRuntimeExceptionConvertingAdapter;
+import static java.text.MessageFormat.format;
+import static terminal.LispTerminal.END_OF_SEGMENT;
 
 public class LispMain {
 
diff --git a/src/main/environment/RuntimeEnvironment.java b/src/main/environment/RuntimeEnvironment.java
index ce0a2aa..a728b64 100644
--- a/src/main/environment/RuntimeEnvironment.java
+++ b/src/main/environment/RuntimeEnvironment.java
@@ -1,11 +1,11 @@
 package environment;
 
+import error.ErrorManager;
+
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.function.Function;
 
-import error.ErrorManager;
-
 public class RuntimeEnvironment {
 
     private static RuntimeEnvironment uniqueInstance = new RuntimeEnvironment();
diff --git a/src/main/error/CriticalLineColumnException.java b/src/main/error/CriticalLineColumnException.java
index 7cd9cbb..def6e1e 100644
--- a/src/main/error/CriticalLineColumnException.java
+++ b/src/main/error/CriticalLineColumnException.java
@@ -1,10 +1,10 @@
 package error;
 
-import static error.ErrorManager.Severity.CRITICAL;
-
 import error.ErrorManager.Severity;
 import file.FilePosition;
 
+import static error.ErrorManager.Severity.CRITICAL;
+
 public abstract class CriticalLineColumnException extends LineColumnException {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/error/CriticalLispException.java b/src/main/error/CriticalLispException.java
index 0c06a03..7707f25 100644
--- a/src/main/error/CriticalLispException.java
+++ b/src/main/error/CriticalLispException.java
@@ -1,9 +1,9 @@
 package error;
 
-import static error.ErrorManager.Severity.CRITICAL;
-
 import error.ErrorManager.Severity;
 
+import static error.ErrorManager.Severity.CRITICAL;
+
 public abstract class CriticalLispException extends LispException {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/error/ErrorManager.java b/src/main/error/ErrorManager.java
index 9bf41e2..8875809 100644
--- a/src/main/error/ErrorManager.java
+++ b/src/main/error/ErrorManager.java
@@ -1,13 +1,13 @@
 package error;
 
+import environment.RuntimeEnvironment;
+
+import java.io.PrintStream;
+
 import static error.ErrorManager.Severity.CRITICAL;
 import static error.ErrorManager.Severity.WARNING;
 import static java.text.MessageFormat.format;
 
-import java.io.PrintStream;
-
-import environment.RuntimeEnvironment;
-
 /**
  * Prints error messages and potentially terminates the application.
  */
diff --git a/src/main/error/LineColumnException.java b/src/main/error/LineColumnException.java
index a559d9e..f02779f 100644
--- a/src/main/error/LineColumnException.java
+++ b/src/main/error/LineColumnException.java
@@ -1,9 +1,9 @@
 package error;
 
-import static java.text.MessageFormat.format;
-
 import file.FilePosition;
 
+import static java.text.MessageFormat.format;
+
 public abstract class LineColumnException extends LispException {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/error/LispException.java b/src/main/error/LispException.java
index 7d09171..22089af 100644
--- a/src/main/error/LispException.java
+++ b/src/main/error/LispException.java
@@ -1,9 +1,9 @@
 package error;
 
-import static error.ErrorManager.Severity.ERROR;
-
 import error.ErrorManager.Severity;
 
+import static error.ErrorManager.Severity.ERROR;
+
 public abstract class LispException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/error/LispWarning.java b/src/main/error/LispWarning.java
index 7670a53..a0799a0 100644
--- a/src/main/error/LispWarning.java
+++ b/src/main/error/LispWarning.java
@@ -1,9 +1,9 @@
 package error;
 
-import static error.ErrorManager.Severity.WARNING;
-
 import error.ErrorManager.Severity;
 
+import static error.ErrorManager.Severity.WARNING;
+
 public abstract class LispWarning extends LispException {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/function/ArgumentValidator.java b/src/main/function/ArgumentValidator.java
index e0492f8..dc0db05 100644
--- a/src/main/function/ArgumentValidator.java
+++ b/src/main/function/ArgumentValidator.java
@@ -1,15 +1,15 @@
 package function;
 
-import static function.builtin.cons.LENGTH.getLength;
-import static java.text.MessageFormat.format;
-
-import java.math.BigInteger;
-
 import error.LispException;
 import sexpression.Cons;
 import sexpression.DisplayName;
 import sexpression.SExpression;
 
+import java.math.BigInteger;
+
+import static function.builtin.cons.LENGTH.getLength;
+import static java.text.MessageFormat.format;
+
 public class ArgumentValidator {
 
     private Class<? extends SExpression> firstArgumentType;
diff --git a/src/main/function/UserDefinedFunction.java b/src/main/function/UserDefinedFunction.java
index 64bbb72..6ed4569 100644
--- a/src/main/function/UserDefinedFunction.java
+++ b/src/main/function/UserDefinedFunction.java
@@ -1,12 +1,5 @@
 package function;
 
-import static function.builtin.EVAL.eval;
-import static java.text.MessageFormat.format;
-import static recursion.TailCalls.done;
-import static sexpression.Nil.NIL;
-
-import java.util.ArrayList;
-
 import error.LispException;
 import recursion.TailCall;
 import recursion.TailCalls;
@@ -16,6 +9,13 @@ import sexpression.Symbol;
 import table.ExecutionContext;
 import table.SymbolTable;
 
+import java.util.ArrayList;
+
+import static function.builtin.EVAL.eval;
+import static java.text.MessageFormat.format;
+import static recursion.TailCalls.done;
+import static sexpression.Nil.NIL;
+
 public class UserDefinedFunction extends LispFunction {
 
     private static final String KEYWORD_REST = "&REST";
diff --git a/src/main/function/builtin/APPLY.java b/src/main/function/builtin/APPLY.java
index 3dbeb62..6637542 100644
--- a/src/main/function/builtin/APPLY.java
+++ b/src/main/function/builtin/APPLY.java
@@ -1,15 +1,15 @@
 package function.builtin;
 
-import static function.builtin.EVAL.applyFunction;
-import static function.builtin.EVAL.lookupFunctionOrLambda;
-import static table.FunctionTable.lookupFunction;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.applyFunction;
+import static function.builtin.EVAL.lookupFunctionOrLambda;
+import static table.FunctionTable.lookupFunction;
+
 @FunctionNames({ "APPLY" })
 public class APPLY extends LispFunction {
 
diff --git a/src/main/function/builtin/BackquoteEvaluator.java b/src/main/function/builtin/BackquoteEvaluator.java
index 67a7b86..462640b 100644
--- a/src/main/function/builtin/BackquoteEvaluator.java
+++ b/src/main/function/builtin/BackquoteEvaluator.java
@@ -1,8 +1,5 @@
 package function.builtin;
 
-import static function.builtin.EVAL.eval;
-import static sexpression.Nil.NIL;
-
 import error.LispException;
 import function.ArgumentValidator;
 import sexpression.AtSignExpression;
@@ -11,6 +8,9 @@ import sexpression.CommaExpression;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+import static sexpression.Nil.NIL;
+
 class BackquoteEvaluator {
 
     private ArgumentValidator listValidator;
diff --git a/src/main/function/builtin/EVAL.java b/src/main/function/builtin/EVAL.java
index efbe839..fb56914 100644
--- a/src/main/function/builtin/EVAL.java
+++ b/src/main/function/builtin/EVAL.java
@@ -1,13 +1,5 @@
 package function.builtin;
 
-import static function.builtin.cons.LIST.makeList;
-import static function.builtin.special.LAMBDA.createFunction;
-import static function.builtin.special.LAMBDA.isLambdaExpression;
-import static java.text.MessageFormat.format;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-import static table.FunctionTable.lookupFunction;
-
 import error.LispException;
 import function.ArgumentValidator;
 import function.FunctionNames;
@@ -20,6 +12,14 @@ import sexpression.SExpression;
 import sexpression.Symbol;
 import table.ExecutionContext;
 
+import static function.builtin.cons.LIST.makeList;
+import static function.builtin.special.LAMBDA.createFunction;
+import static function.builtin.special.LAMBDA.isLambdaExpression;
+import static java.text.MessageFormat.format;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+import static table.FunctionTable.lookupFunction;
+
 @FunctionNames({ "EVAL" })
 public class EVAL extends LispFunction {
 
diff --git a/src/main/function/builtin/EXIT.java b/src/main/function/builtin/EXIT.java
index aabda51..5b91760 100644
--- a/src/main/function/builtin/EXIT.java
+++ b/src/main/function/builtin/EXIT.java
@@ -1,7 +1,5 @@
 package function.builtin;
 
-import static sexpression.Nil.NIL;
-
 import environment.RuntimeEnvironment;
 import function.ArgumentValidator;
 import function.FunctionNames;
@@ -9,6 +7,8 @@ import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+
 @FunctionNames({ "EXIT" })
 public class EXIT extends LispFunction {
 
diff --git a/src/main/function/builtin/FUNCALL.java b/src/main/function/builtin/FUNCALL.java
index 30e6685..c21194a 100644
--- a/src/main/function/builtin/FUNCALL.java
+++ b/src/main/function/builtin/FUNCALL.java
@@ -1,14 +1,14 @@
 package function.builtin;
 
-import static function.builtin.APPLY.apply;
-import static function.builtin.cons.LIST.makeList;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.APPLY.apply;
+import static function.builtin.cons.LIST.makeList;
+
 @FunctionNames({ "FUNCALL", "CALL" })
 public class FUNCALL extends LispFunction {
 
diff --git a/src/main/function/builtin/GENSYM.java b/src/main/function/builtin/GENSYM.java
index 7708426..a07d74d 100644
--- a/src/main/function/builtin/GENSYM.java
+++ b/src/main/function/builtin/GENSYM.java
@@ -1,7 +1,5 @@
 package function.builtin;
 
-import java.math.BigInteger;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
@@ -9,6 +7,8 @@ import sexpression.Cons;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import java.math.BigInteger;
+
 @FunctionNames({ "GENSYM" })
 public class GENSYM extends LispFunction {
 
diff --git a/src/main/function/builtin/LOAD.java b/src/main/function/builtin/LOAD.java
index 29993db..3892be9 100644
--- a/src/main/function/builtin/LOAD.java
+++ b/src/main/function/builtin/LOAD.java
@@ -1,15 +1,5 @@
 package function.builtin;
 
-import static function.builtin.EVAL.eval;
-import static java.text.MessageFormat.format;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-import static util.Path.getPathPrefix;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Stack;
-
 import environment.RuntimeEnvironment;
 import error.LispException;
 import error.LispWarning;
@@ -21,6 +11,16 @@ import sexpression.Cons;
 import sexpression.LispString;
 import sexpression.SExpression;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Stack;
+
+import static function.builtin.EVAL.eval;
+import static java.text.MessageFormat.format;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+import static util.Path.getPathPrefix;
+
 @FunctionNames({ "LOAD" })
 public class LOAD extends LispFunction {
 
diff --git a/src/main/function/builtin/SET.java b/src/main/function/builtin/SET.java
index 0d3e90b..ee70249 100644
--- a/src/main/function/builtin/SET.java
+++ b/src/main/function/builtin/SET.java
@@ -1,7 +1,5 @@
 package function.builtin;
 
-import static table.FunctionTable.lookupFunction;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
@@ -11,6 +9,8 @@ import sexpression.Symbol;
 import table.ExecutionContext;
 import table.SymbolTable;
 
+import static table.FunctionTable.lookupFunction;
+
 @FunctionNames({ "SET" })
 public class SET extends LispFunction {
 
diff --git a/src/main/function/builtin/SYMBOL_FUNCTION.java b/src/main/function/builtin/SYMBOL_FUNCTION.java
index 022c211..8f847c2 100644
--- a/src/main/function/builtin/SYMBOL_FUNCTION.java
+++ b/src/main/function/builtin/SYMBOL_FUNCTION.java
@@ -1,8 +1,5 @@
 package function.builtin;
 
-import static java.text.MessageFormat.format;
-import static table.FunctionTable.lookupFunction;
-
 import error.LispException;
 import function.ArgumentValidator;
 import function.FunctionNames;
@@ -13,6 +10,9 @@ import sexpression.Cons;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import static java.text.MessageFormat.format;
+import static table.FunctionTable.lookupFunction;
+
 @FunctionNames({ "SYMBOL-FUNCTION" })
 public class SYMBOL_FUNCTION extends LispFunction {
 
diff --git a/src/main/function/builtin/cons/APPEND.java b/src/main/function/builtin/cons/APPEND.java
index 3ffd146..cc7b29c 100644
--- a/src/main/function/builtin/cons/APPEND.java
+++ b/src/main/function/builtin/cons/APPEND.java
@@ -1,13 +1,13 @@
 package function.builtin.cons;
 
-import static sexpression.Nil.NIL;
-import static table.FunctionTable.lookupFunction;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 
+import static sexpression.Nil.NIL;
+import static table.FunctionTable.lookupFunction;
+
 @FunctionNames({ "APPEND" })
 public class APPEND extends LispFunction {
 
diff --git a/src/main/function/builtin/cons/LENGTH.java b/src/main/function/builtin/cons/LENGTH.java
index 9a1088a..34a75bf 100644
--- a/src/main/function/builtin/cons/LENGTH.java
+++ b/src/main/function/builtin/cons/LENGTH.java
@@ -1,12 +1,5 @@
 package function.builtin.cons;
 
-import static function.builtin.cons.LIST.makeList;
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static table.FunctionTable.lookupFunction;
-
-import java.math.BigInteger;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
@@ -14,6 +7,13 @@ import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.LispNumber;
 
+import java.math.BigInteger;
+
+import static function.builtin.cons.LIST.makeList;
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static table.FunctionTable.lookupFunction;
+
 @FunctionNames({ "LENGTH" })
 public class LENGTH extends LispFunction {
 
diff --git a/src/main/function/builtin/cons/LIST.java b/src/main/function/builtin/cons/LIST.java
index f45d4f3..8a07cb4 100644
--- a/src/main/function/builtin/cons/LIST.java
+++ b/src/main/function/builtin/cons/LIST.java
@@ -1,13 +1,13 @@
 package function.builtin.cons;
 
-import static sexpression.Nil.NIL;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+
 @FunctionNames({ "LIST" })
 public class LIST extends LispFunction {
 
diff --git a/src/main/function/builtin/math/DIVIDE.java b/src/main/function/builtin/math/DIVIDE.java
index ea1bbf2..7c63391 100644
--- a/src/main/function/builtin/math/DIVIDE.java
+++ b/src/main/function/builtin/math/DIVIDE.java
@@ -1,7 +1,5 @@
 package function.builtin.math;
 
-import java.math.BigInteger;
-
 import error.LispException;
 import function.ArgumentValidator;
 import function.FunctionNames;
@@ -9,6 +7,8 @@ import function.LispFunction;
 import sexpression.Cons;
 import sexpression.LispNumber;
 
+import java.math.BigInteger;
+
 @FunctionNames({ "/" })
 public class DIVIDE extends LispFunction {
 
diff --git a/src/main/function/builtin/math/MINUS.java b/src/main/function/builtin/math/MINUS.java
index c1c5270..44e655f 100644
--- a/src/main/function/builtin/math/MINUS.java
+++ b/src/main/function/builtin/math/MINUS.java
@@ -1,13 +1,13 @@
 package function.builtin.math;
 
-import java.math.BigInteger;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.LispNumber;
 
+import java.math.BigInteger;
+
 @FunctionNames({ "-" })
 public class MINUS extends LispFunction {
 
diff --git a/src/main/function/builtin/math/MULTIPLY.java b/src/main/function/builtin/math/MULTIPLY.java
index f61018a..236cfa5 100644
--- a/src/main/function/builtin/math/MULTIPLY.java
+++ b/src/main/function/builtin/math/MULTIPLY.java
@@ -1,13 +1,13 @@
 package function.builtin.math;
 
-import static sexpression.LispNumber.ONE;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.LispNumber;
 
+import static sexpression.LispNumber.ONE;
+
 @FunctionNames({ "*" })
 public class MULTIPLY extends LispFunction {
 
diff --git a/src/main/function/builtin/math/MathFunction.java b/src/main/function/builtin/math/MathFunction.java
index 2cbc075..fcd8500 100644
--- a/src/main/function/builtin/math/MathFunction.java
+++ b/src/main/function/builtin/math/MathFunction.java
@@ -1,16 +1,16 @@
 package function.builtin.math;
 
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
 import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.LispNumber;
 import sexpression.SExpression;
 
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+
 class MathFunction {
 
     Function<LispNumber, LispNumber> singleValueOperation;
diff --git a/src/main/function/builtin/math/PLUS.java b/src/main/function/builtin/math/PLUS.java
index 2dd3e3c..785b8af 100644
--- a/src/main/function/builtin/math/PLUS.java
+++ b/src/main/function/builtin/math/PLUS.java
@@ -1,13 +1,13 @@
 package function.builtin.math;
 
-import static sexpression.LispNumber.ZERO;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.LispNumber;
 
+import static sexpression.LispNumber.ZERO;
+
 @FunctionNames({ "+" })
 public class PLUS extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/ATOM.java b/src/main/function/builtin/predicate/ATOM.java
index 11259a3..a8301a6 100644
--- a/src/main/function/builtin/predicate/ATOM.java
+++ b/src/main/function/builtin/predicate/ATOM.java
@@ -1,14 +1,14 @@
 package function.builtin.predicate;
 
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "ATOM", "ATOM?" })
 public class ATOM extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/EQ.java b/src/main/function/builtin/predicate/EQ.java
index 489be54..2dac67b 100644
--- a/src/main/function/builtin/predicate/EQ.java
+++ b/src/main/function/builtin/predicate/EQ.java
@@ -1,14 +1,14 @@
 package function.builtin.predicate;
 
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "EQ", "EQ?" })
 public class EQ extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/EQUAL.java b/src/main/function/builtin/predicate/EQUAL.java
index 52fce66..92e77ce 100644
--- a/src/main/function/builtin/predicate/EQUAL.java
+++ b/src/main/function/builtin/predicate/EQUAL.java
@@ -1,14 +1,14 @@
 package function.builtin.predicate;
 
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "EQUAL", "EQUAL?" })
 public class EQUAL extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/GENSYM_EQUAL.java b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
index 075a6a2..9964ee9 100644
--- a/src/main/function/builtin/predicate/GENSYM_EQUAL.java
+++ b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
@@ -1,8 +1,10 @@
 package function.builtin.predicate;
 
-import static function.builtin.GENSYM.GENSYM_PREFIX;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,11 +12,9 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import function.ArgumentValidator;
-import function.FunctionNames;
-import function.LispFunction;
-import sexpression.Cons;
-import sexpression.SExpression;
+import static function.builtin.GENSYM.GENSYM_PREFIX;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
 
 @FunctionNames({ "GENSYM-EQUAL", "GENSYM-EQUAL?" })
 public class GENSYM_EQUAL extends LispFunction {
diff --git a/src/main/function/builtin/predicate/LISTP.java b/src/main/function/builtin/predicate/LISTP.java
index 7f42a61..e8d0d06 100644
--- a/src/main/function/builtin/predicate/LISTP.java
+++ b/src/main/function/builtin/predicate/LISTP.java
@@ -1,14 +1,14 @@
 package function.builtin.predicate;
 
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "LISTP", "LIST?" })
 public class LISTP extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/NULL.java b/src/main/function/builtin/predicate/NULL.java
index 1ad1e9b..216cd8c 100644
--- a/src/main/function/builtin/predicate/NULL.java
+++ b/src/main/function/builtin/predicate/NULL.java
@@ -1,14 +1,14 @@
 package function.builtin.predicate;
 
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "NULL", "NULL?" })
 public class NULL extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
index 6ad23b0..7e11f8f 100644
--- a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
+++ b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
@@ -1,10 +1,5 @@
 package function.builtin.predicate;
 
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
@@ -13,6 +8,11 @@ import sexpression.Cons;
 import sexpression.LispNumber;
 import sexpression.SExpression;
 
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "=" })
 public class NUMERIC_EQUAL extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/NUMERIC_GREATER.java b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
index af253d4..e3dc795 100644
--- a/src/main/function/builtin/predicate/NUMERIC_GREATER.java
+++ b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
@@ -1,10 +1,5 @@
 package function.builtin.predicate;
 
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
@@ -13,6 +8,11 @@ import sexpression.Cons;
 import sexpression.LispNumber;
 import sexpression.SExpression;
 
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ ">" })
 public class NUMERIC_GREATER extends LispFunction {
 
diff --git a/src/main/function/builtin/predicate/NUMERIC_LESS.java b/src/main/function/builtin/predicate/NUMERIC_LESS.java
index 4311c4b..ac5d8c7 100644
--- a/src/main/function/builtin/predicate/NUMERIC_LESS.java
+++ b/src/main/function/builtin/predicate/NUMERIC_LESS.java
@@ -1,10 +1,5 @@
 package function.builtin.predicate;
 
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
@@ -13,6 +8,11 @@ import sexpression.Cons;
 import sexpression.LispNumber;
 import sexpression.SExpression;
 
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "<" })
 public class NUMERIC_LESS extends LispFunction {
 
diff --git a/src/main/function/builtin/special/AND.java b/src/main/function/builtin/special/AND.java
index 1930562..160e431 100644
--- a/src/main/function/builtin/special/AND.java
+++ b/src/main/function/builtin/special/AND.java
@@ -1,10 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -12,6 +7,11 @@ import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "AND" })
 public class AND extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/CASE.java b/src/main/function/builtin/special/CASE.java
index 6de951e..8cce375 100644
--- a/src/main/function/builtin/special/CASE.java
+++ b/src/main/function/builtin/special/CASE.java
@@ -1,12 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static function.builtin.predicate.EQUAL.isEqual;
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -15,6 +8,13 @@ import sexpression.Cons;
 import sexpression.Nil;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+import static function.builtin.predicate.EQUAL.isEqual;
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+
 @FunctionNames({ "CASE" })
 public class CASE extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/COND.java b/src/main/function/builtin/special/COND.java
index 31878ed..c769a9d 100644
--- a/src/main/function/builtin/special/COND.java
+++ b/src/main/function/builtin/special/COND.java
@@ -1,10 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -13,6 +8,11 @@ import sexpression.Cons;
 import sexpression.Nil;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+
 @FunctionNames({ "COND" })
 public class COND extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/Define.java b/src/main/function/builtin/special/Define.java
index eb065d9..22f300c 100644
--- a/src/main/function/builtin/special/Define.java
+++ b/src/main/function/builtin/special/Define.java
@@ -1,10 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.cons.LIST.makeList;
-import static java.text.MessageFormat.format;
-import static table.FunctionTable.defineFunction;
-import static table.FunctionTable.isAlreadyDefined;
-
 import environment.RuntimeEnvironment;
 import error.LispWarning;
 import function.ArgumentValidator;
@@ -14,6 +9,11 @@ import sexpression.Cons;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import static function.builtin.cons.LIST.makeList;
+import static java.text.MessageFormat.format;
+import static table.FunctionTable.defineFunction;
+import static table.FunctionTable.isAlreadyDefined;
+
 public abstract class Define extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
diff --git a/src/main/function/builtin/special/IF.java b/src/main/function/builtin/special/IF.java
index 6a58076..09f29a5 100644
--- a/src/main/function/builtin/special/IF.java
+++ b/src/main/function/builtin/special/IF.java
@@ -1,13 +1,13 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+
 @FunctionNames({ "IF" })
 public class IF extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/LAMBDA.java b/src/main/function/builtin/special/LAMBDA.java
index a5ad2db..f4f70a3 100644
--- a/src/main/function/builtin/special/LAMBDA.java
+++ b/src/main/function/builtin/special/LAMBDA.java
@@ -1,7 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.cons.LIST.makeList;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -11,6 +9,8 @@ import sexpression.LambdaExpression;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import static function.builtin.cons.LIST.makeList;
+
 @FunctionNames({ "LAMBDA", "Λ" })
 public class LAMBDA extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/LET.java b/src/main/function/builtin/special/LET.java
index ee0e752..73112d5 100644
--- a/src/main/function/builtin/special/LET.java
+++ b/src/main/function/builtin/special/LET.java
@@ -1,8 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static sexpression.Nil.NIL;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -12,6 +9,9 @@ import sexpression.Symbol;
 import table.ExecutionContext;
 import table.SymbolTable;
 
+import static function.builtin.EVAL.eval;
+import static sexpression.Nil.NIL;
+
 @FunctionNames({ "LET" })
 public class LET extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/OR.java b/src/main/function/builtin/special/OR.java
index 722e084..c18772e 100644
--- a/src/main/function/builtin/special/OR.java
+++ b/src/main/function/builtin/special/OR.java
@@ -1,9 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -11,6 +7,10 @@ import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+
 @FunctionNames({ "OR" })
 public class OR extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/PROGN.java b/src/main/function/builtin/special/PROGN.java
index d819bff..12f1a47 100644
--- a/src/main/function/builtin/special/PROGN.java
+++ b/src/main/function/builtin/special/PROGN.java
@@ -1,10 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static recursion.TailCalls.done;
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -12,6 +7,11 @@ import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static function.builtin.EVAL.eval;
+import static recursion.TailCalls.done;
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+
 @FunctionNames({ "PROGN", "BEGIN" })
 public class PROGN extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/RECUR.java b/src/main/function/builtin/special/RECUR.java
index 66ce1f8..f3006d4 100644
--- a/src/main/function/builtin/special/RECUR.java
+++ b/src/main/function/builtin/special/RECUR.java
@@ -1,7 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.evaluateFunctionArgumentList;
-
 import error.LispException;
 import function.ArgumentValidator;
 import function.FunctionNames;
@@ -10,6 +8,8 @@ import sexpression.Cons;
 import sexpression.SExpression;
 import table.ExecutionContext;
 
+import static function.builtin.EVAL.evaluateFunctionArgumentList;
+
 @FunctionNames({ "RECUR" })
 public class RECUR extends LispSpecialFunction {
 
diff --git a/src/main/function/builtin/special/SETQ.java b/src/main/function/builtin/special/SETQ.java
index 4572ca5..b38340c 100644
--- a/src/main/function/builtin/special/SETQ.java
+++ b/src/main/function/builtin/special/SETQ.java
@@ -1,9 +1,5 @@
 package function.builtin.special;
 
-import static function.builtin.EVAL.eval;
-import static function.builtin.SET.set;
-import static function.builtin.cons.LIST.makeList;
-
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispSpecialFunction;
@@ -11,6 +7,10 @@ import sexpression.Cons;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import static function.builtin.EVAL.eval;
+import static function.builtin.SET.set;
+import static function.builtin.cons.LIST.makeList;
+
 @FunctionNames({ "SETQ" })
 public class SETQ extends LispSpecialFunction {
 
diff --git a/src/main/interpreter/LispInterpreter.java b/src/main/interpreter/LispInterpreter.java
index 1c9fca2..c0f4cdf 100644
--- a/src/main/interpreter/LispInterpreter.java
+++ b/src/main/interpreter/LispInterpreter.java
@@ -1,15 +1,15 @@
 package interpreter;
 
-import static function.builtin.EVAL.eval;
-
-import java.io.InputStream;
-import java.util.List;
-
 import environment.RuntimeEnvironment;
 import error.LispException;
 import parser.LispParser;
 import sexpression.SExpression;
 
+import java.io.InputStream;
+import java.util.List;
+
+import static function.builtin.EVAL.eval;
+
 public class LispInterpreter {
 
     protected RuntimeEnvironment environment;
diff --git a/src/main/interpreter/LispInterpreterBuilderImpl.java b/src/main/interpreter/LispInterpreterBuilderImpl.java
index d73ba90..921fb1f 100644
--- a/src/main/interpreter/LispInterpreterBuilderImpl.java
+++ b/src/main/interpreter/LispInterpreterBuilderImpl.java
@@ -1,6 +1,9 @@
 package interpreter;
 
-import static util.Path.getPathPrefix;
+import environment.RuntimeEnvironment;
+import error.CriticalLispException;
+import error.ErrorManager;
+import interpreter.LispInterpreter.LanguageFile;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -10,10 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
-import environment.RuntimeEnvironment;
-import error.CriticalLispException;
-import error.ErrorManager;
-import interpreter.LispInterpreter.LanguageFile;
+import static util.Path.getPathPrefix;
 
 public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
 
diff --git a/src/main/parser/LispParser.java b/src/main/parser/LispParser.java
index 160db7d..041584f 100644
--- a/src/main/parser/LispParser.java
+++ b/src/main/parser/LispParser.java
@@ -1,13 +1,13 @@
 package parser;
 
-import java.io.InputStream;
-
 import error.LispException;
 import scanner.LispScanner;
 import sexpression.SExpression;
 import token.Eof;
 import token.Token;
 
+import java.io.InputStream;
+
 /**
  * Converts a stream of bytes into internal representations of Lisp s-expressions.
  */
diff --git a/src/main/recursion/TailCall.java b/src/main/recursion/TailCall.java
index cf21548..0facd50 100644
--- a/src/main/recursion/TailCall.java
+++ b/src/main/recursion/TailCall.java
@@ -16,14 +16,10 @@ public interface TailCall<T> {
     }
 
     default T invoke() {
-        // @formatter:off
-
         return Stream.iterate(this, TailCall::apply)
                      .filter(TailCall::isComplete)
                      .findFirst()
                      .get()
                      .result();
-
-        // @formatter:on
     }
 }
diff --git a/src/main/scanner/LispCommentRemovingInputStream.java b/src/main/scanner/LispCommentRemovingInputStream.java
index c866076..5155978 100644
--- a/src/main/scanner/LispCommentRemovingInputStream.java
+++ b/src/main/scanner/LispCommentRemovingInputStream.java
@@ -1,15 +1,15 @@
 package scanner;
 
+import stream.SafeInputStream;
+
+import java.io.InputStream;
+
 import static util.Characters.BACKSLASH;
 import static util.Characters.DOUBLE_QUOTE;
 import static util.Characters.EOF;
 import static util.Characters.NEWLINE;
 import static util.Characters.SEMICOLON;
 
-import java.io.InputStream;
-
-import stream.SafeInputStream;
-
 /**
  * Removes Lisp comments from an input stream.
  */
diff --git a/src/main/scanner/LispScanner.java b/src/main/scanner/LispScanner.java
index 1b8a1cc..8d267c3 100644
--- a/src/main/scanner/LispScanner.java
+++ b/src/main/scanner/LispScanner.java
@@ -1,5 +1,16 @@
 package scanner;
 
+import error.LineColumnException;
+import file.FilePosition;
+import file.FilePositionTracker;
+import token.Token;
+import token.TokenFactory;
+import token.TokenFactoryImpl;
+import util.Characters;
+
+import java.io.InputStream;
+import java.util.function.Function;
+
 import static java.lang.Character.isDigit;
 import static java.lang.Character.isWhitespace;
 import static util.Characters.BACKSLASH;
@@ -9,17 +20,6 @@ import static util.Characters.NEWLINE;
 import static util.Characters.isLegalIdentifierCharacter;
 import static util.Characters.isNumberPrefix;
 
-import java.io.InputStream;
-import java.util.function.Function;
-
-import error.LineColumnException;
-import file.FilePosition;
-import file.FilePositionTracker;
-import token.Token;
-import token.TokenFactory;
-import token.TokenFactoryImpl;
-import util.Characters;
-
 /**
  * Converts a stream of bytes into a stream of Lisp tokens.
  */
diff --git a/src/main/sexpression/Cons.java b/src/main/sexpression/Cons.java
index a3652c1..fa2d1b7 100644
--- a/src/main/sexpression/Cons.java
+++ b/src/main/sexpression/Cons.java
@@ -1,10 +1,10 @@
 package sexpression;
 
+import recursion.TailCall;
+
 import static recursion.TailCalls.done;
 import static recursion.TailCalls.tailCall;
 
-import recursion.TailCall;
-
 @DisplayName("list")
 public class Cons extends SExpression {
 
diff --git a/src/main/sexpression/LispNumber.java b/src/main/sexpression/LispNumber.java
index ebd4c70..696e64b 100644
--- a/src/main/sexpression/LispNumber.java
+++ b/src/main/sexpression/LispNumber.java
@@ -1,10 +1,10 @@
 package sexpression;
 
-import static java.text.MessageFormat.format;
+import error.LispException;
 
 import java.math.BigInteger;
 
-import error.LispException;
+import static java.text.MessageFormat.format;
 
 @DisplayName("number")
 public class LispNumber extends Atom {
diff --git a/src/main/stream/SafeInputStream.java b/src/main/stream/SafeInputStream.java
index ae3c06c..5632f8f 100644
--- a/src/main/stream/SafeInputStream.java
+++ b/src/main/stream/SafeInputStream.java
@@ -1,11 +1,11 @@
 package stream;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class SafeInputStream {
 
     private InputStreamReader underlyingStream;
diff --git a/src/main/stream/UncheckedIOException.java b/src/main/stream/UncheckedIOException.java
index 196221e..dee1aa6 100644
--- a/src/main/stream/UncheckedIOException.java
+++ b/src/main/stream/UncheckedIOException.java
@@ -1,9 +1,9 @@
 package stream;
 
-import java.io.IOException;
-
 import error.CriticalLispException;
 
+import java.io.IOException;
+
 public class UncheckedIOException extends CriticalLispException {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/table/ExecutionContext.java b/src/main/table/ExecutionContext.java
index 6a24be7..a20d3df 100644
--- a/src/main/table/ExecutionContext.java
+++ b/src/main/table/ExecutionContext.java
@@ -1,13 +1,13 @@
 package table;
 
-import static sexpression.Nil.NIL;
-
-import java.util.Stack;
-
 import function.LispFunction;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import java.util.Stack;
+
+import static sexpression.Nil.NIL;
+
 public class ExecutionContext {
 
     private static ExecutionContext uniqueInstance = new ExecutionContext();
diff --git a/src/main/table/FunctionTable.java b/src/main/table/FunctionTable.java
index 4bcabbd..5ee5038 100644
--- a/src/main/table/FunctionTable.java
+++ b/src/main/table/FunctionTable.java
@@ -1,12 +1,5 @@
 package table;
 
-import static java.text.MessageFormat.format;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import error.CriticalLispException;
 import function.FunctionNames;
 import function.LispFunction;
@@ -58,6 +51,13 @@ import function.builtin.special.QUOTE;
 import function.builtin.special.RECUR;
 import function.builtin.special.SETQ;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static java.text.MessageFormat.format;
+
 public class FunctionTable {
 
     private static Set<Class<? extends LispFunction>> allBuiltIns = new HashSet<>();
diff --git a/src/main/table/SymbolTable.java b/src/main/table/SymbolTable.java
index f8a5aaf..b04636b 100644
--- a/src/main/table/SymbolTable.java
+++ b/src/main/table/SymbolTable.java
@@ -1,17 +1,17 @@
 package table;
 
-import static function.builtin.cons.APPEND.append;
-import static function.builtin.cons.LIST.makeList;
-import static sexpression.Nil.NIL;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 
-import sexpression.Cons;
-import sexpression.SExpression;
-import sexpression.Symbol;
+import static function.builtin.cons.APPEND.append;
+import static function.builtin.cons.LIST.makeList;
+import static sexpression.Nil.NIL;
 
 public class SymbolTable {
 
diff --git a/src/main/terminal/ControlSequenceHandler.java b/src/main/terminal/ControlSequenceHandler.java
index 395ba5a..51e5cd0 100644
--- a/src/main/terminal/ControlSequenceHandler.java
+++ b/src/main/terminal/ControlSequenceHandler.java
@@ -1,12 +1,12 @@
 package terminal;
 
+import stream.SafeInputStream;
+
 import static java.lang.Character.isDigit;
 import static util.Characters.EOF;
 import static util.Characters.LEFT_SQUARE_BRACKET;
 import static util.Characters.UNICODE_ESCAPE;
 
-import stream.SafeInputStream;
-
 class ControlSequenceHandler {
 
     public static final boolean isEscape(char c) {
diff --git a/src/main/terminal/ControlSequenceLookup.java b/src/main/terminal/ControlSequenceLookup.java
index ac21133..2cec30a 100644
--- a/src/main/terminal/ControlSequenceLookup.java
+++ b/src/main/terminal/ControlSequenceLookup.java
@@ -1,11 +1,11 @@
 package terminal;
 
-import static terminal.SelectGraphicRendition.SGR_COMMAND;
+import terminal.ControlSequence.NullControlSequence;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import terminal.ControlSequence.NullControlSequence;
+import static terminal.SelectGraphicRendition.SGR_COMMAND;
 
 public class ControlSequenceLookup {
 
diff --git a/src/main/terminal/LispTerminal.java b/src/main/terminal/LispTerminal.java
index 119314f..77e24e8 100644
--- a/src/main/terminal/LispTerminal.java
+++ b/src/main/terminal/LispTerminal.java
@@ -1,5 +1,17 @@
 package terminal;
 
+import com.googlecode.lanterna.TerminalPosition;
+import com.googlecode.lanterna.TerminalSize;
+import com.googlecode.lanterna.input.KeyStroke;
+import com.googlecode.lanterna.input.KeyType;
+import com.googlecode.lanterna.terminal.IOSafeTerminal;
+import stream.SafeInputStream;
+import stream.SafeOutputStream;
+
+import java.io.ByteArrayInputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import static com.googlecode.lanterna.input.KeyType.ArrowDown;
 import static com.googlecode.lanterna.input.KeyType.ArrowLeft;
 import static com.googlecode.lanterna.input.KeyType.ArrowRight;
@@ -12,19 +24,6 @@ import static terminal.ControlSequenceHandler.isEscape;
 import static util.Characters.EOF;
 import static util.Characters.UNICODE_NULL;
 
-import java.io.ByteArrayInputStream;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import com.googlecode.lanterna.TerminalPosition;
-import com.googlecode.lanterna.TerminalSize;
-import com.googlecode.lanterna.input.KeyStroke;
-import com.googlecode.lanterna.input.KeyType;
-import com.googlecode.lanterna.terminal.IOSafeTerminal;
-
-import stream.SafeInputStream;
-import stream.SafeOutputStream;
-
 public class LispTerminal {
 
     public static final char END_OF_SEGMENT = UNICODE_NULL;
diff --git a/src/main/terminal/TerminalConfiguration.java b/src/main/terminal/TerminalConfiguration.java
index 294a52c..c6173f6 100644
--- a/src/main/terminal/TerminalConfiguration.java
+++ b/src/main/terminal/TerminalConfiguration.java
@@ -1,13 +1,12 @@
 package terminal;
 
+import com.googlecode.lanterna.terminal.IOSafeTerminal;
+import stream.UncheckedIOException;
+
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 
-import com.googlecode.lanterna.terminal.IOSafeTerminal;
-
-import stream.UncheckedIOException;
-
 public class TerminalConfiguration {
 
     private PipedOutputStream inputWriter;
diff --git a/src/main/token/AtSign.java b/src/main/token/AtSign.java
index 483ad17..0f045d0 100644
--- a/src/main/token/AtSign.java
+++ b/src/main/token/AtSign.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.AtSignExpression;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class AtSign extends Token {
 
     public AtSign(String text, FilePosition position) {
diff --git a/src/main/token/Backquote.java b/src/main/token/Backquote.java
index 5fdb321..427f4e8 100644
--- a/src/main/token/Backquote.java
+++ b/src/main/token/Backquote.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.BackquoteExpression;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class Backquote extends Token {
 
     public Backquote(String text, FilePosition position) {
diff --git a/src/main/token/Comma.java b/src/main/token/Comma.java
index ad90e75..5944e84 100644
--- a/src/main/token/Comma.java
+++ b/src/main/token/Comma.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.CommaExpression;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class Comma extends Token {
 
     public Comma(String text, FilePosition position) {
diff --git a/src/main/token/Eof.java b/src/main/token/Eof.java
index 70d4b09..a308db7 100644
--- a/src/main/token/Eof.java
+++ b/src/main/token/Eof.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import error.LineColumnException;
 import file.FilePosition;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class Eof extends Token {
 
     public Eof(String text, FilePosition position) {
diff --git a/src/main/token/Identifier.java b/src/main/token/Identifier.java
index 77c270e..402be86 100644
--- a/src/main/token/Identifier.java
+++ b/src/main/token/Identifier.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import java.util.function.Supplier;
+
 public class Identifier extends Token {
 
     public Identifier(String text, FilePosition position) {
diff --git a/src/main/token/LeftParenthesis.java b/src/main/token/LeftParenthesis.java
index 409e998..c63a5b6 100644
--- a/src/main/token/LeftParenthesis.java
+++ b/src/main/token/LeftParenthesis.java
@@ -1,10 +1,10 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class LeftParenthesis extends Token {
 
     public LeftParenthesis(String text, FilePosition position) {
diff --git a/src/main/token/Number.java b/src/main/token/Number.java
index e4f29aa..8c78eb1 100644
--- a/src/main/token/Number.java
+++ b/src/main/token/Number.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.LispNumber;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class Number extends Token {
 
     public Number(String text, FilePosition position) {
diff --git a/src/main/token/QuoteMark.java b/src/main/token/QuoteMark.java
index 10a0f1b..b3b706c 100644
--- a/src/main/token/QuoteMark.java
+++ b/src/main/token/QuoteMark.java
@@ -1,14 +1,14 @@
 package token;
 
-import static sexpression.Nil.NIL;
-
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.Cons;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import java.util.function.Supplier;
+
+import static sexpression.Nil.NIL;
+
 public class QuoteMark extends Token {
 
     public QuoteMark(String text, FilePosition position) {
diff --git a/src/main/token/QuotedString.java b/src/main/token/QuotedString.java
index 17f281c..153f5dd 100644
--- a/src/main/token/QuotedString.java
+++ b/src/main/token/QuotedString.java
@@ -1,11 +1,11 @@
 package token;
 
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import sexpression.LispString;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
 public class QuotedString extends Token {
 
     public QuotedString(String text, FilePosition position) {
diff --git a/src/main/token/RightParenthesis.java b/src/main/token/RightParenthesis.java
index ec30d8e..f702288 100644
--- a/src/main/token/RightParenthesis.java
+++ b/src/main/token/RightParenthesis.java
@@ -1,16 +1,16 @@
 package token;
 
-import static recursion.TailCalls.done;
-import static sexpression.Nil.NIL;
-
-import java.util.function.Supplier;
-
 import error.LineColumnException;
 import file.FilePosition;
 import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
+import static recursion.TailCalls.done;
+import static sexpression.Nil.NIL;
+
 public class RightParenthesis extends Token {
 
     public RightParenthesis(String text, FilePosition position) {
diff --git a/src/main/token/Token.java b/src/main/token/Token.java
index c23b777..ba316ef 100644
--- a/src/main/token/Token.java
+++ b/src/main/token/Token.java
@@ -1,15 +1,15 @@
 package token;
 
-import static recursion.TailCalls.tailCall;
-import static sexpression.Nil.NIL;
-
-import java.util.function.Supplier;
-
 import file.FilePosition;
 import recursion.TailCall;
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import java.util.function.Supplier;
+
+import static recursion.TailCalls.tailCall;
+import static sexpression.Nil.NIL;
+
 public abstract class Token {
 
     private String text;
diff --git a/src/main/token/TokenFactory.java b/src/main/token/TokenFactory.java
index cf3cbc4..5910b52 100644
--- a/src/main/token/TokenFactory.java
+++ b/src/main/token/TokenFactory.java
@@ -1,11 +1,11 @@
 package token;
 
-import static java.text.MessageFormat.format;
-
 import error.CriticalLineColumnException;
 import error.LineColumnException;
 import file.FilePosition;
 
+import static java.text.MessageFormat.format;
+
 public interface TokenFactory {
 
     Token createToken(String text, FilePosition position);
diff --git a/src/main/token/TokenFactoryImpl.java b/src/main/token/TokenFactoryImpl.java
index 25adace..93a47ea 100644
--- a/src/main/token/TokenFactoryImpl.java
+++ b/src/main/token/TokenFactoryImpl.java
@@ -1,5 +1,7 @@
 package token;
 
+import file.FilePosition;
+
 import static java.lang.Character.isDigit;
 import static util.Characters.AT_SIGN;
 import static util.Characters.BACKQUOTE;
@@ -11,8 +13,6 @@ import static util.Characters.SINGLE_QUOTE;
 import static util.Characters.isLegalIdentifierCharacter;
 import static util.Characters.isNumberPrefix;
 
-import file.FilePosition;
-
 public class TokenFactoryImpl implements TokenFactory {
 
     @Override
diff --git a/src/test/acceptance/AcceptanceTest.java b/src/test/acceptance/AcceptanceTest.java
index 52abf41..854d208 100644
--- a/src/test/acceptance/AcceptanceTest.java
+++ b/src/test/acceptance/AcceptanceTest.java
@@ -1,8 +1,7 @@
 package acceptance;
 
-import org.junit.runner.RunWith;
-
 import fitnesse.junit.FitNesseRunner;
+import org.junit.runner.RunWith;
 
 @RunWith(FitNesseRunner.class)
 @FitNesseRunner.Suite("TranscendentalLisp")
diff --git a/src/test/acceptance/fixture/LispInterpreterFixture.java b/src/test/acceptance/fixture/LispInterpreterFixture.java
index f084f1f..5c2597d 100644
--- a/src/test/acceptance/fixture/LispInterpreterFixture.java
+++ b/src/test/acceptance/fixture/LispInterpreterFixture.java
@@ -1,8 +1,10 @@
 package acceptance.fixture;
 
-import static application.LispMain.LANGUAGE_FILE_NAMES;
-import static table.FunctionTable.resetFunctionTable;
-import static util.Path.getPathPrefix;
+import environment.RuntimeEnvironment;
+import interpreter.LispInterpreter;
+import interpreter.LispInterpreterBuilder;
+import interpreter.LispInterpreterBuilderImpl;
+import table.ExecutionContext;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -10,11 +12,9 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
 
-import environment.RuntimeEnvironment;
-import interpreter.LispInterpreter;
-import interpreter.LispInterpreterBuilder;
-import interpreter.LispInterpreterBuilderImpl;
-import table.ExecutionContext;
+import static application.LispMain.LANGUAGE_FILE_NAMES;
+import static table.FunctionTable.resetFunctionTable;
+import static util.Path.getPathPrefix;
 
 public class LispInterpreterFixture {
 
diff --git a/src/test/application/MainTest.java b/src/test/application/MainTest.java
index 321aa17..6488e87 100644
--- a/src/test/application/MainTest.java
+++ b/src/test/application/MainTest.java
@@ -1,31 +1,29 @@
 package application;
 
-import static com.googlecode.lanterna.input.KeyType.Enter;
-import static java.text.MessageFormat.format;
-import static application.LispMain.ANSI_GREEN;
-import static application.LispMain.ANSI_PURPLE;
-import static application.LispMain.ANSI_RESET;
-import static application.LispMain.GREETING;
-import static org.junit.Assert.assertEquals;
-
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.concurrent.CountDownLatch;
-
+import com.googlecode.lanterna.terminal.virtual.DefaultVirtualTerminal;
+import environment.RuntimeEnvironment;
+import interpreter.LispInterpreterBuilderImpl;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ExpectedSystemExit;
 import org.junit.contrib.java.lang.system.SystemErrRule;
 import org.junit.contrib.java.lang.system.SystemOutRule;
-
-import com.googlecode.lanterna.terminal.virtual.DefaultVirtualTerminal;
-
-import environment.RuntimeEnvironment;
-import interpreter.LispInterpreterBuilderImpl;
 import terminal.TerminalConfiguration;
 import terminal.VirtualTerminalInteractor;
 import testutil.SymbolAndFunctionCleaner;
 
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.util.concurrent.CountDownLatch;
+
+import static application.LispMain.ANSI_GREEN;
+import static application.LispMain.ANSI_PURPLE;
+import static application.LispMain.ANSI_RESET;
+import static application.LispMain.GREETING;
+import static com.googlecode.lanterna.input.KeyType.Enter;
+import static java.text.MessageFormat.format;
+import static org.junit.Assert.assertEquals;
+
 public class MainTest extends SymbolAndFunctionCleaner {
 
     private RuntimeEnvironment environment;
diff --git a/src/test/environment/RuntimeEnvironmentTest.java b/src/test/environment/RuntimeEnvironmentTest.java
index 099df93..22675af 100644
--- a/src/test/environment/RuntimeEnvironmentTest.java
+++ b/src/test/environment/RuntimeEnvironmentTest.java
@@ -1,19 +1,18 @@
 package environment;
 
+import error.ErrorManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import error.ErrorManager;
-
 public class RuntimeEnvironmentTest {
 
     private static final String TERMINATED_SUCCESSFULLY = "TERMINATED_SUCCESSFULLY";
diff --git a/src/test/error/ErrorManagerTest.java b/src/test/error/ErrorManagerTest.java
index 3075765..2793f12 100644
--- a/src/test/error/ErrorManagerTest.java
+++ b/src/test/error/ErrorManagerTest.java
@@ -1,22 +1,21 @@
 package error;
 
-import static error.ErrorManager.Severity.CRITICAL;
-import static error.ErrorManager.Severity.ERROR;
-import static error.ErrorManager.Severity.WARNING;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import environment.RuntimeEnvironment;
+import error.ErrorManager.Severity;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import environment.RuntimeEnvironment;
-import error.ErrorManager.Severity;
+import static error.ErrorManager.Severity.CRITICAL;
+import static error.ErrorManager.Severity.ERROR;
+import static error.ErrorManager.Severity.WARNING;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class ErrorManagerTest {
 
diff --git a/src/test/file/FilePositionTrackerTest.java b/src/test/file/FilePositionTrackerTest.java
index 715ae16..882705f 100644
--- a/src/test/file/FilePositionTrackerTest.java
+++ b/src/test/file/FilePositionTrackerTest.java
@@ -1,12 +1,12 @@
 package file;
 
-import static org.junit.Assert.assertTrue;
-
-import java.util.Objects;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Objects;
+
+import static org.junit.Assert.assertTrue;
+
 public class FilePositionTrackerTest {
 
     public static final String FILE_NAME = "testFile";
diff --git a/src/test/function/ArgumentValidatorTest.java b/src/test/function/ArgumentValidatorTest.java
index cfb8291..d284caf 100644
--- a/src/test/function/ArgumentValidatorTest.java
+++ b/src/test/function/ArgumentValidatorTest.java
@@ -1,5 +1,17 @@
 package function;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.DottedArgumentListException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Before;
+import org.junit.Test;
+import sexpression.Cons;
+import sexpression.LispString;
+import sexpression.Nil;
+import sexpression.SExpression;
+import sexpression.Symbol;
+
 import static error.ErrorManager.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -7,19 +19,6 @@ import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.DottedArgumentListException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import sexpression.Cons;
-import sexpression.LispString;
-import sexpression.Nil;
-import sexpression.SExpression;
-import sexpression.Symbol;
-
 public class ArgumentValidatorTest {
 
     private ArgumentValidator validator;
diff --git a/src/test/function/LispFunctionTest.java b/src/test/function/LispFunctionTest.java
index 9a516e4..7ca00c0 100644
--- a/src/test/function/LispFunctionTest.java
+++ b/src/test/function/LispFunctionTest.java
@@ -1,12 +1,11 @@
 package function;
 
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
-
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static org.junit.Assert.assertTrue;
+
 public class LispFunctionTest {
 
     @Test
diff --git a/src/test/function/LispSpecialFunctionTest.java b/src/test/function/LispSpecialFunctionTest.java
index 300c61a..4e064bd 100644
--- a/src/test/function/LispSpecialFunctionTest.java
+++ b/src/test/function/LispSpecialFunctionTest.java
@@ -1,12 +1,11 @@
 package function;
 
-import static org.junit.Assert.assertFalse;
-
 import org.junit.Test;
-
 import sexpression.Cons;
 import sexpression.SExpression;
 
+import static org.junit.Assert.assertFalse;
+
 public class LispSpecialFunctionTest {
 
     @Test
diff --git a/src/test/function/UserDefinedFunctionTest.java b/src/test/function/UserDefinedFunctionTest.java
index 1d35be5..29cd20f 100644
--- a/src/test/function/UserDefinedFunctionTest.java
+++ b/src/test/function/UserDefinedFunctionTest.java
@@ -1,22 +1,21 @@
 package function;
 
+import error.ErrorManager;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import function.UserDefinedFunction.IllegalKeywordRestPositionException;
+import org.junit.Test;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.SExpression;
+import sexpression.Symbol;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static testutil.TestUtilities.assertSExpressionsMatch;
 
-import org.junit.Test;
-
-import error.ErrorManager;
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import function.UserDefinedFunction.IllegalKeywordRestPositionException;
-import sexpression.Cons;
-import sexpression.LispNumber;
-import sexpression.SExpression;
-import sexpression.Symbol;
-
 public class UserDefinedFunctionTest {
 
     private static final String FUNCTION_NAME = "TEST";
diff --git a/src/test/function/builtin/APPLYTest.java b/src/test/function/builtin/APPLYTest.java
index b3e5746..2087c00 100644
--- a/src/test/function/builtin/APPLYTest.java
+++ b/src/test/function/builtin/APPLYTest.java
@@ -1,20 +1,19 @@
 package function.builtin;
 
-import static function.builtin.APPLY.apply;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedFunctionException;
+import org.junit.Test;
 import sexpression.Cons;
 import testutil.SymbolAndFunctionCleaner;
 
+import static function.builtin.APPLY.apply;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class APPLYTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/BackquoteEvaluatorTest.java b/src/test/function/builtin/BackquoteEvaluatorTest.java
index 071a921..1be36b2 100644
--- a/src/test/function/builtin/BackquoteEvaluatorTest.java
+++ b/src/test/function/builtin/BackquoteEvaluatorTest.java
@@ -1,18 +1,11 @@
 package function.builtin;
 
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-import static testutil.TestUtilities.assertIsErrorWithMessage;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.makeList;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.DottedArgumentListException;
 import function.builtin.BackquoteEvaluator.AtSignNotInCommaException;
 import function.builtin.BackquoteEvaluator.AtSignNotListException;
 import function.builtin.BackquoteEvaluator.NestedAtSignException;
 import function.builtin.BackquoteEvaluator.NestedCommaException;
+import org.junit.Test;
 import sexpression.AtSignExpression;
 import sexpression.BackquoteExpression;
 import sexpression.CommaExpression;
@@ -22,6 +15,12 @@ import sexpression.LispString;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
+import static sexpression.Nil.NIL;
+import static sexpression.Symbol.T;
+import static testutil.TestUtilities.assertIsErrorWithMessage;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.makeList;
+
 public class BackquoteEvaluatorTest {
 
     private BackquoteEvaluator createBackquoteEvaluator(SExpression expression) {
diff --git a/src/test/function/builtin/EVALTest.java b/src/test/function/builtin/EVALTest.java
index 053eb28..ca36fca 100644
--- a/src/test/function/builtin/EVALTest.java
+++ b/src/test/function/builtin/EVALTest.java
@@ -1,16 +1,5 @@
 package function.builtin;
 
-import static function.builtin.EVAL.lookupSymbol;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import static sexpression.Nil.NIL;
-import static testutil.TestUtilities.assertIsErrorWithMessage;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
@@ -20,8 +9,18 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import function.builtin.EVAL.UnmatchedAtSignException;
 import function.builtin.EVAL.UnmatchedCommaException;
 import function.builtin.special.RECUR.RecurNotInTailPositionException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import static function.builtin.EVAL.lookupSymbol;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static sexpression.Nil.NIL;
+import static testutil.TestUtilities.assertIsErrorWithMessage;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class EVALTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/EXITTest.java b/src/test/function/builtin/EXITTest.java
index 30569a5..c9a0965 100644
--- a/src/test/function/builtin/EXITTest.java
+++ b/src/test/function/builtin/EXITTest.java
@@ -1,17 +1,16 @@
 package function.builtin;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.evaluateString;
+import environment.RuntimeEnvironment;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Test;
-
-import environment.RuntimeEnvironment;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.evaluateString;
 
 public class EXITTest extends SymbolAndFunctionCleaner {
 
diff --git a/src/test/function/builtin/FUNCALLTest.java b/src/test/function/builtin/FUNCALLTest.java
index 9dc4057..5d2d7b1 100644
--- a/src/test/function/builtin/FUNCALLTest.java
+++ b/src/test/function/builtin/FUNCALLTest.java
@@ -1,14 +1,13 @@
 package function.builtin;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class FUNCALLTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/GENSYMTest.java b/src/test/function/builtin/GENSYMTest.java
index b196096..5befff7 100644
--- a/src/test/function/builtin/GENSYMTest.java
+++ b/src/test/function/builtin/GENSYMTest.java
@@ -1,17 +1,16 @@
 package function.builtin;
 
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+import token.TokenFactory.BadCharacterException;
+
 import static function.builtin.GENSYM.GENSYM_PREFIX;
 import static testutil.TestUtilities.assertSExpressionsDoNotMatch;
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertSymbol;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-import token.TokenFactory.BadCharacterException;
-
 public class GENSYMTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/LOADTest.java b/src/test/function/builtin/LOADTest.java
index df900da..f8c150f 100644
--- a/src/test/function/builtin/LOADTest.java
+++ b/src/test/function/builtin/LOADTest.java
@@ -1,22 +1,21 @@
 package function.builtin;
 
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TypeAssertions.assertNil;
-import static testutil.TypeAssertions.assertT;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
 import environment.RuntimeEnvironment;
 import error.ErrorManager;
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TypeAssertions.assertNil;
+import static testutil.TypeAssertions.assertT;
+
 public class LOADTest extends SymbolAndFunctionCleaner {
 
     private ByteArrayOutputStream outputStream;
diff --git a/src/test/function/builtin/PRINTTest.java b/src/test/function/builtin/PRINTTest.java
index 97d59e1..4587939 100644
--- a/src/test/function/builtin/PRINTTest.java
+++ b/src/test/function/builtin/PRINTTest.java
@@ -1,19 +1,18 @@
 package function.builtin;
 
-import static java.text.MessageFormat.format;
-import static org.junit.Assert.assertEquals;
-import static testutil.TestUtilities.evaluateString;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
 import environment.RuntimeEnvironment;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static java.text.MessageFormat.format;
+import static org.junit.Assert.assertEquals;
+import static testutil.TestUtilities.evaluateString;
+
 public class PRINTTest extends SymbolAndFunctionCleaner {
 
     private RuntimeEnvironment environment;
diff --git a/src/test/function/builtin/SETTest.java b/src/test/function/builtin/SETTest.java
index 524b6e5..47fb866 100644
--- a/src/test/function/builtin/SETTest.java
+++ b/src/test/function/builtin/SETTest.java
@@ -1,19 +1,18 @@
 package function.builtin;
 
-import static org.junit.Assert.assertNull;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
 import sexpression.LispNumber;
 import table.SymbolTable;
 import testutil.SymbolAndFunctionCleaner;
 
+import static org.junit.Assert.assertNull;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class SETTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/SYMBOLSTest.java b/src/test/function/builtin/SYMBOLSTest.java
index 88d87c3..1c47a78 100644
--- a/src/test/function/builtin/SYMBOLSTest.java
+++ b/src/test/function/builtin/SYMBOLSTest.java
@@ -1,13 +1,12 @@
 package function.builtin;
 
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class SYMBOLSTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
index ef53fb4..44d32dd 100644
--- a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
+++ b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
@@ -1,5 +1,12 @@
 package function.builtin;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import function.builtin.SYMBOL_FUNCTION.UndefinedSymbolFunctionException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static error.ErrorManager.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -7,14 +14,6 @@ import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static testutil.TestUtilities.evaluateString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import function.builtin.SYMBOL_FUNCTION.UndefinedSymbolFunctionException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class SYMBOL_FUNCTIONTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/cons/APPENDTest.java b/src/test/function/builtin/cons/APPENDTest.java
index 5ed6fa9..5378fec 100644
--- a/src/test/function/builtin/cons/APPENDTest.java
+++ b/src/test/function/builtin/cons/APPENDTest.java
@@ -1,17 +1,16 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class APPENDTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/cons/CONSTest.java b/src/test/function/builtin/cons/CONSTest.java
index 2299b74..53a7b63 100644
--- a/src/test/function/builtin/cons/CONSTest.java
+++ b/src/test/function/builtin/cons/CONSTest.java
@@ -1,17 +1,16 @@
 package function.builtin.cons;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import sexpression.Cons;
+import sexpression.Symbol;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import sexpression.Cons;
-import sexpression.Symbol;
-import testutil.SymbolAndFunctionCleaner;
-
 public class CONSTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/cons/FIRSTTest.java b/src/test/function/builtin/cons/FIRSTTest.java
index 89cdeec..c509634 100644
--- a/src/test/function/builtin/cons/FIRSTTest.java
+++ b/src/test/function/builtin/cons/FIRSTTest.java
@@ -1,16 +1,15 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class FIRSTTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/cons/LENGTHTest.java b/src/test/function/builtin/cons/LENGTHTest.java
index f46ebf7..0668a38 100644
--- a/src/test/function/builtin/cons/LENGTHTest.java
+++ b/src/test/function/builtin/cons/LENGTHTest.java
@@ -1,17 +1,16 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class LENGTHTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/cons/LISTTest.java b/src/test/function/builtin/cons/LISTTest.java
index 52b6975..b869eee 100644
--- a/src/test/function/builtin/cons/LISTTest.java
+++ b/src/test/function/builtin/cons/LISTTest.java
@@ -1,14 +1,13 @@
 package function.builtin.cons;
 
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static function.builtin.cons.LIST.makeList;
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import testutil.SymbolAndFunctionCleaner;
-
 public class LISTTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/cons/RESTTest.java b/src/test/function/builtin/cons/RESTTest.java
index 90dcf29..46c70d6 100644
--- a/src/test/function/builtin/cons/RESTTest.java
+++ b/src/test/function/builtin/cons/RESTTest.java
@@ -1,16 +1,15 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class RESTTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/math/DIVIDETest.java b/src/test/function/builtin/math/DIVIDETest.java
index 087ddc5..f27409a 100644
--- a/src/test/function/builtin/math/DIVIDETest.java
+++ b/src/test/function/builtin/math/DIVIDETest.java
@@ -1,17 +1,16 @@
 package function.builtin.math;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.builtin.math.DIVIDE.DivideByZeroException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertIsErrorWithMessage;
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.builtin.math.DIVIDE.DivideByZeroException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class DIVIDETest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/math/MINUSTest.java b/src/test/function/builtin/math/MINUSTest.java
index 41a2937..6c350e1 100644
--- a/src/test/function/builtin/math/MINUSTest.java
+++ b/src/test/function/builtin/math/MINUSTest.java
@@ -1,15 +1,14 @@
 package function.builtin.math;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
+import org.junit.Test;
 import sexpression.LispNumber;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class MINUSTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/math/MODULOTest.java b/src/test/function/builtin/math/MODULOTest.java
index 93f2403..83f4df7 100644
--- a/src/test/function/builtin/math/MODULOTest.java
+++ b/src/test/function/builtin/math/MODULOTest.java
@@ -1,18 +1,17 @@
 package function.builtin.math;
 
-import static testutil.TestUtilities.assertIsErrorWithMessage;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.math.MODULO.ModulusNotPositiveException;
+import org.junit.Test;
 import sexpression.LispNumber;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertIsErrorWithMessage;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class MODULOTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/math/MULTIPLYTest.java b/src/test/function/builtin/math/MULTIPLYTest.java
index c32fc6d..d6cd2c9 100644
--- a/src/test/function/builtin/math/MULTIPLYTest.java
+++ b/src/test/function/builtin/math/MULTIPLYTest.java
@@ -1,14 +1,13 @@
 package function.builtin.math;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import org.junit.Test;
+import sexpression.LispNumber;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import sexpression.LispNumber;
-import testutil.SymbolAndFunctionCleaner;
-
 public class MULTIPLYTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/math/PLUSTest.java b/src/test/function/builtin/math/PLUSTest.java
index 47833f1..9e297dc 100644
--- a/src/test/function/builtin/math/PLUSTest.java
+++ b/src/test/function/builtin/math/PLUSTest.java
@@ -1,14 +1,13 @@
 package function.builtin.math;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import org.junit.Test;
+import sexpression.LispNumber;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import sexpression.LispNumber;
-import testutil.SymbolAndFunctionCleaner;
-
 public class PLUSTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/math/REMAINDERTest.java b/src/test/function/builtin/math/REMAINDERTest.java
index d5096ab..0573267 100644
--- a/src/test/function/builtin/math/REMAINDERTest.java
+++ b/src/test/function/builtin/math/REMAINDERTest.java
@@ -1,17 +1,16 @@
 package function.builtin.math;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.math.DIVIDE.DivideByZeroException;
+import org.junit.Test;
 import sexpression.LispNumber;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class REMAINDERTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/ATOMTest.java b/src/test/function/builtin/predicate/ATOMTest.java
index 3e07bcf..89dd78c 100644
--- a/src/test/function/builtin/predicate/ATOMTest.java
+++ b/src/test/function/builtin/predicate/ATOMTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class ATOMTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/EQTest.java b/src/test/function/builtin/predicate/EQTest.java
index 92b9318..32eca6e 100644
--- a/src/test/function/builtin/predicate/EQTest.java
+++ b/src/test/function/builtin/predicate/EQTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class EQTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/EQUALTest.java b/src/test/function/builtin/predicate/EQUALTest.java
index 7c537d5..59a71e6 100644
--- a/src/test/function/builtin/predicate/EQUALTest.java
+++ b/src/test/function/builtin/predicate/EQUALTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class EQUALTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
index fc85965..154d201 100644
--- a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
+++ b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class GENSYM_EQUALTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/LISTPTest.java b/src/test/function/builtin/predicate/LISTPTest.java
index b06ebaf..16a5f25 100644
--- a/src/test/function/builtin/predicate/LISTPTest.java
+++ b/src/test/function/builtin/predicate/LISTPTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class LISTPTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/NULLTest.java b/src/test/function/builtin/predicate/NULLTest.java
index 29825c9..913dc18 100644
--- a/src/test/function/builtin/predicate/NULLTest.java
+++ b/src/test/function/builtin/predicate/NULLTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class NULLTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
index 69a5244..3a71462 100644
--- a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class NUMERIC_EQUALTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
index 05ddda5..16e38bd 100644
--- a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class NUMERIC_GREATERTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
index 7721ef3..c2147d6 100644
--- a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
@@ -1,15 +1,14 @@
 package function.builtin.predicate;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class NUMERIC_LESSTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/ANDTest.java b/src/test/function/builtin/special/ANDTest.java
index 42b2034..9d02cc8 100644
--- a/src/test/function/builtin/special/ANDTest.java
+++ b/src/test/function/builtin/special/ANDTest.java
@@ -1,16 +1,15 @@
 package function.builtin.special;
 
+import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
+import sexpression.LispNumber;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.builtin.EVAL.UndefinedSymbolException;
-import sexpression.LispNumber;
-import testutil.SymbolAndFunctionCleaner;
-
 public class ANDTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/CASETest.java b/src/test/function/builtin/special/CASETest.java
index 1b0c610..a113d97 100644
--- a/src/test/function/builtin/special/CASETest.java
+++ b/src/test/function/builtin/special/CASETest.java
@@ -1,15 +1,14 @@
 package function.builtin.special;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class CASETest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/CONDTest.java b/src/test/function/builtin/special/CONDTest.java
index db0ef3e..fd015c2 100644
--- a/src/test/function/builtin/special/CONDTest.java
+++ b/src/test/function/builtin/special/CONDTest.java
@@ -1,15 +1,14 @@
 package function.builtin.special;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.DottedArgumentListException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.DottedArgumentListException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class CONDTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/DEFINE_SPECIALTest.java b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
index 11953b5..1453e5f 100644
--- a/src/test/function/builtin/special/DEFINE_SPECIALTest.java
+++ b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
@@ -1,15 +1,5 @@
 package function.builtin.special;
 
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
 import environment.RuntimeEnvironment;
 import error.ErrorManager;
 import function.ArgumentValidator.BadArgumentTypeException;
@@ -17,8 +7,17 @@ import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class DEFINE_SPECIALTest extends SymbolAndFunctionCleaner {
 
     private ByteArrayOutputStream outputStream;
diff --git a/src/test/function/builtin/special/DEFMACROTest.java b/src/test/function/builtin/special/DEFMACROTest.java
index f62d565..2936242 100644
--- a/src/test/function/builtin/special/DEFMACROTest.java
+++ b/src/test/function/builtin/special/DEFMACROTest.java
@@ -1,15 +1,5 @@
 package function.builtin.special;
 
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
 import environment.RuntimeEnvironment;
 import error.ErrorManager;
 import function.ArgumentValidator.BadArgumentTypeException;
@@ -17,8 +7,17 @@ import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class DEFMACROTest extends SymbolAndFunctionCleaner {
 
     private ByteArrayOutputStream outputStream;
diff --git a/src/test/function/builtin/special/DEFUNTest.java b/src/test/function/builtin/special/DEFUNTest.java
index 593099d..ed19758 100644
--- a/src/test/function/builtin/special/DEFUNTest.java
+++ b/src/test/function/builtin/special/DEFUNTest.java
@@ -1,15 +1,5 @@
 package function.builtin.special;
 
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
 import environment.RuntimeEnvironment;
 import error.ErrorManager;
 import function.ArgumentValidator.BadArgumentTypeException;
@@ -17,8 +7,17 @@ import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class DEFUNTest extends SymbolAndFunctionCleaner {
 
     private ByteArrayOutputStream outputStream;
diff --git a/src/test/function/builtin/special/FUSETest.java b/src/test/function/builtin/special/FUSETest.java
index 77803a3..ddd9586 100644
--- a/src/test/function/builtin/special/FUSETest.java
+++ b/src/test/function/builtin/special/FUSETest.java
@@ -1,16 +1,15 @@
 package function.builtin.special;
 
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
 import sexpression.Symbol;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class FUSETest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/IFTest.java b/src/test/function/builtin/special/IFTest.java
index 478b3d0..6216362 100644
--- a/src/test/function/builtin/special/IFTest.java
+++ b/src/test/function/builtin/special/IFTest.java
@@ -1,16 +1,15 @@
 package function.builtin.special;
 
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TypeAssertions.assertNil;
-import static testutil.TypeAssertions.assertT;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TypeAssertions.assertNil;
+import static testutil.TypeAssertions.assertT;
+
 public class IFTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/LAMBDATest.java b/src/test/function/builtin/special/LAMBDATest.java
index 4cfd4fd..539793d 100644
--- a/src/test/function/builtin/special/LAMBDATest.java
+++ b/src/test/function/builtin/special/LAMBDATest.java
@@ -1,5 +1,16 @@
 package function.builtin.special;
 
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.DottedArgumentListException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import function.builtin.EVAL.UndefinedFunctionException;
+import org.junit.Test;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.Symbol;
+import testutil.SymbolAndFunctionCleaner;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static sexpression.LispNumber.ONE;
@@ -9,18 +20,6 @@ import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.BadArgumentTypeException;
-import function.ArgumentValidator.DottedArgumentListException;
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import function.builtin.EVAL.UndefinedFunctionException;
-import sexpression.Cons;
-import sexpression.LispNumber;
-import sexpression.Symbol;
-import testutil.SymbolAndFunctionCleaner;
-
 public class LAMBDATest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/LETTest.java b/src/test/function/builtin/special/LETTest.java
index 728b6c6..234f50f 100644
--- a/src/test/function/builtin/special/LETTest.java
+++ b/src/test/function/builtin/special/LETTest.java
@@ -1,20 +1,19 @@
 package function.builtin.special;
 
-import static sexpression.Nil.NIL;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
 import sexpression.Cons;
 import sexpression.LispNumber;
 import testutil.SymbolAndFunctionCleaner;
 
+import static sexpression.Nil.NIL;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class LETTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/LET_STARTest.java b/src/test/function/builtin/special/LET_STARTest.java
index d6bf683..df7074c 100644
--- a/src/test/function/builtin/special/LET_STARTest.java
+++ b/src/test/function/builtin/special/LET_STARTest.java
@@ -1,20 +1,19 @@
 package function.builtin.special;
 
-import static sexpression.Nil.NIL;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.DottedArgumentListException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
 import sexpression.Cons;
 import sexpression.LispNumber;
 import testutil.SymbolAndFunctionCleaner;
 
+import static sexpression.Nil.NIL;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class LET_STARTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/ORTest.java b/src/test/function/builtin/special/ORTest.java
index 33beb92..3c19a19 100644
--- a/src/test/function/builtin/special/ORTest.java
+++ b/src/test/function/builtin/special/ORTest.java
@@ -1,16 +1,15 @@
 package function.builtin.special;
 
+import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
+import sexpression.LispNumber;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertNil;
 import static testutil.TypeAssertions.assertT;
 
-import org.junit.Test;
-
-import function.builtin.EVAL.UndefinedSymbolException;
-import sexpression.LispNumber;
-import testutil.SymbolAndFunctionCleaner;
-
 public class ORTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/PROGNTest.java b/src/test/function/builtin/special/PROGNTest.java
index 3ba03e5..ff02fc7 100644
--- a/src/test/function/builtin/special/PROGNTest.java
+++ b/src/test/function/builtin/special/PROGNTest.java
@@ -1,14 +1,13 @@
 package function.builtin.special;
 
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 import static testutil.TypeAssertions.assertNil;
 
-import org.junit.Test;
-
-import testutil.SymbolAndFunctionCleaner;
-
 public class PROGNTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/QUOTETest.java b/src/test/function/builtin/special/QUOTETest.java
index 7acbf40..9092414 100644
--- a/src/test/function/builtin/special/QUOTETest.java
+++ b/src/test/function/builtin/special/QUOTETest.java
@@ -1,15 +1,14 @@
 package function.builtin.special;
 
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import org.junit.Test;
+import testutil.SymbolAndFunctionCleaner;
+
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.evaluateString;
 import static testutil.TestUtilities.parseString;
 
-import org.junit.Test;
-
-import function.ArgumentValidator.TooFewArgumentsException;
-import function.ArgumentValidator.TooManyArgumentsException;
-import testutil.SymbolAndFunctionCleaner;
-
 public class QUOTETest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/function/builtin/special/RECURTest.java b/src/test/function/builtin/special/RECURTest.java
index cd7fd5d..56bb983 100644
--- a/src/test/function/builtin/special/RECURTest.java
+++ b/src/test/function/builtin/special/RECURTest.java
@@ -1,21 +1,20 @@
 package function.builtin.special;
 
-import static org.junit.Assert.fail;
-import static testutil.TestUtilities.assertIsErrorWithMessage;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-import static testutil.TestUtilities.parseString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.special.RECUR.NestedRecurException;
 import function.builtin.special.RECUR.RecurNotInTailPositionException;
 import function.builtin.special.RECUR.RecurOutsideOfFunctionException;
+import org.junit.Test;
 import sexpression.SExpression;
 import testutil.SymbolAndFunctionCleaner;
 
+import static org.junit.Assert.fail;
+import static testutil.TestUtilities.assertIsErrorWithMessage;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
+
 public class RECURTest extends SymbolAndFunctionCleaner {
 
     @Test(expected = RecurOutsideOfFunctionException.class)
diff --git a/src/test/function/builtin/special/SETQTest.java b/src/test/function/builtin/special/SETQTest.java
index f09f243..c018a0b 100644
--- a/src/test/function/builtin/special/SETQTest.java
+++ b/src/test/function/builtin/special/SETQTest.java
@@ -1,19 +1,18 @@
 package function.builtin.special;
 
-import static org.junit.Assert.assertNull;
-import static testutil.TestUtilities.assertSExpressionsMatch;
-import static testutil.TestUtilities.evaluateString;
-
-import org.junit.Test;
-
 import function.ArgumentValidator.BadArgumentTypeException;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedSymbolException;
+import org.junit.Test;
 import sexpression.LispNumber;
 import table.SymbolTable;
 import testutil.SymbolAndFunctionCleaner;
 
+import static org.junit.Assert.assertNull;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+
 public class SETQTest extends SymbolAndFunctionCleaner {
 
     @Test
diff --git a/src/test/interpreter/LispInterpreterTest.java b/src/test/interpreter/LispInterpreterTest.java
index 9a69064..e1aee0e 100644
--- a/src/test/interpreter/LispInterpreterTest.java
+++ b/src/test/interpreter/LispInterpreterTest.java
@@ -1,5 +1,16 @@
 package interpreter;
 
+import environment.RuntimeEnvironment;
+import interpreter.LispInterpreterBuilderImpl.InterpreterAlreadyBuiltException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.HashSet;
+import java.util.Set;
+
 import static error.ErrorManager.Severity.CRITICAL;
 import static interpreter.InteractiveLispInterpreter.PROMPT;
 import static java.text.MessageFormat.format;
@@ -9,18 +20,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static testutil.TestUtilities.createInputStreamFromString;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import environment.RuntimeEnvironment;
-import interpreter.LispInterpreterBuilderImpl.InterpreterAlreadyBuiltException;
-
 public class LispInterpreterTest {
 
     private static final String TERMINATED = "terminated";
diff --git a/src/test/parser/LispParserTest.java b/src/test/parser/LispParserTest.java
index ec47957..13f15b0 100644
--- a/src/test/parser/LispParserTest.java
+++ b/src/test/parser/LispParserTest.java
@@ -1,5 +1,15 @@
 package parser;
 
+import error.LispException;
+import org.junit.Test;
+import scanner.LispScanner.UnterminatedStringException;
+import stream.UncheckedIOException;
+import token.Eof.EofEncounteredException;
+import token.RightParenthesis.StartsWithRightParenthesisException;
+import token.TokenFactory.BadCharacterException;
+
+import java.io.InputStream;
+
 import static error.ErrorManager.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -17,17 +27,6 @@ import static testutil.TypeAssertions.assertNumber;
 import static testutil.TypeAssertions.assertString;
 import static testutil.TypeAssertions.assertSymbol;
 
-import java.io.InputStream;
-
-import org.junit.Test;
-
-import error.LispException;
-import scanner.LispScanner.UnterminatedStringException;
-import stream.UncheckedIOException;
-import token.Eof.EofEncounteredException;
-import token.RightParenthesis.StartsWithRightParenthesisException;
-import token.TokenFactory.BadCharacterException;
-
 public class LispParserTest {
 
     private LispParser createLispParser(String input) {
diff --git a/src/test/recursion/TailCallTest.java b/src/test/recursion/TailCallTest.java
index b3a9466..f8dd401 100644
--- a/src/test/recursion/TailCallTest.java
+++ b/src/test/recursion/TailCallTest.java
@@ -1,9 +1,9 @@
 package recursion;
 
-import static recursion.TailCalls.done;
-
 import org.junit.Test;
 
+import static recursion.TailCalls.done;
+
 public class TailCallTest {
 
     @Test(expected = UnsupportedOperationException.class)
diff --git a/src/test/scanner/LispCommentRemovingInputStreamTest.java b/src/test/scanner/LispCommentRemovingInputStreamTest.java
index 60150cb..ae986f4 100644
--- a/src/test/scanner/LispCommentRemovingInputStreamTest.java
+++ b/src/test/scanner/LispCommentRemovingInputStreamTest.java
@@ -1,5 +1,11 @@
 package scanner;
 
+import org.junit.Test;
+import scanner.LispInputStream.MaximumUnreadsExceededException;
+import stream.UncheckedIOException;
+
+import java.io.InputStream;
+
 import static error.ErrorManager.Severity.CRITICAL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -7,13 +13,6 @@ import static org.junit.Assert.assertTrue;
 import static testutil.TestUtilities.createIOExceptionThrowingInputStream;
 import static testutil.TestUtilities.createInputStreamFromString;
 
-import java.io.InputStream;
-
-import org.junit.Test;
-
-import scanner.LispInputStream.MaximumUnreadsExceededException;
-import stream.UncheckedIOException;
-
 public class LispCommentRemovingInputStreamTest {
 
     private String getLispCommentRemovingInputStreamResult(String inputString) {
diff --git a/src/test/scanner/LispScannerLineColumnTest.java b/src/test/scanner/LispScannerLineColumnTest.java
index 0bba8dd..201ba9d 100644
--- a/src/test/scanner/LispScannerLineColumnTest.java
+++ b/src/test/scanner/LispScannerLineColumnTest.java
@@ -1,14 +1,13 @@
 package scanner;
 
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.createInputStreamFromString;
+import file.FilePosition;
+import org.junit.Test;
+import token.Token;
 
 import java.io.InputStream;
 
-import org.junit.Test;
-
-import file.FilePosition;
-import token.Token;
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.createInputStreamFromString;
 
 public class LispScannerLineColumnTest {
 
diff --git a/src/test/scanner/LispScannerTextTest.java b/src/test/scanner/LispScannerTextTest.java
index 11c9344..9694d43 100644
--- a/src/test/scanner/LispScannerTextTest.java
+++ b/src/test/scanner/LispScannerTextTest.java
@@ -1,13 +1,12 @@
 package scanner;
 
-import static org.junit.Assert.assertEquals;
-import static testutil.TestUtilities.createInputStreamFromString;
+import file.FilePosition;
+import org.junit.Test;
 
 import java.io.InputStream;
 
-import org.junit.Test;
-
-import file.FilePosition;
+import static org.junit.Assert.assertEquals;
+import static testutil.TestUtilities.createInputStreamFromString;
 
 public class LispScannerTextTest {
 
diff --git a/src/test/scanner/LispScannerTypeTest.java b/src/test/scanner/LispScannerTypeTest.java
index 4365913..7a5fe62 100644
--- a/src/test/scanner/LispScannerTypeTest.java
+++ b/src/test/scanner/LispScannerTypeTest.java
@@ -1,18 +1,7 @@
 package scanner;
 
-import static error.ErrorManager.Severity.ERROR;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static testutil.TestUtilities.createInputStreamFromString;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
-
 import scanner.LispScanner.UnterminatedStringException;
 import token.AtSign;
 import token.Backquote;
@@ -27,6 +16,16 @@ import token.RightParenthesis;
 import token.Token;
 import token.TokenFactory.BadCharacterException;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static error.ErrorManager.Severity.ERROR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static testutil.TestUtilities.createInputStreamFromString;
+
 public class LispScannerTypeTest {
 
     private List<Class<? extends Token>> expectedTypes;
diff --git a/src/test/sexpression/SExpressionTest.java b/src/test/sexpression/SExpressionTest.java
index 8d08874..da9dfc8 100644
--- a/src/test/sexpression/SExpressionTest.java
+++ b/src/test/sexpression/SExpressionTest.java
@@ -1,5 +1,12 @@
 package sexpression;
 
+import function.UserDefinedFunction;
+import org.junit.Test;
+import sexpression.LispNumber.InvalidNumberException;
+
+import java.math.BigInteger;
+import java.util.Locale;
+
 import static error.ErrorManager.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -8,14 +15,6 @@ import static sexpression.Nil.NIL;
 import static testutil.TestUtilities.assertSExpressionsMatch;
 import static testutil.TestUtilities.makeList;
 
-import java.math.BigInteger;
-import java.util.Locale;
-
-import org.junit.Test;
-
-import function.UserDefinedFunction;
-import sexpression.LispNumber.InvalidNumberException;
-
 public class SExpressionTest {
 
     private void assertSExpressionMatchesString(String expected, SExpression sExpression) {
diff --git a/src/test/stream/SafeInputStreamTest.java b/src/test/stream/SafeInputStreamTest.java
index e20c378..ded9b5f 100644
--- a/src/test/stream/SafeInputStreamTest.java
+++ b/src/test/stream/SafeInputStreamTest.java
@@ -1,12 +1,12 @@
 package stream;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static testutil.TestUtilities.createIOExceptionThrowingInputStream;
 import static testutil.TestUtilities.createInputStreamFromString;
 
-import org.junit.Before;
-import org.junit.Test;
-
 public class SafeInputStreamTest {
 
     SafeInputStream safe;
diff --git a/src/test/stream/SafeOutputStreamTest.java b/src/test/stream/SafeOutputStreamTest.java
index c181691..0348cbf 100644
--- a/src/test/stream/SafeOutputStreamTest.java
+++ b/src/test/stream/SafeOutputStreamTest.java
@@ -1,13 +1,13 @@
 package stream;
 
-import static org.junit.Assert.assertEquals;
-import static testutil.TestUtilities.createIOExceptionThrowingOutputStream;
-
-import java.io.ByteArrayOutputStream;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.ByteArrayOutputStream;
+
+import static org.junit.Assert.assertEquals;
+import static testutil.TestUtilities.createIOExceptionThrowingOutputStream;
+
 public class SafeOutputStreamTest {
 
     SafeOutputStream safe;
diff --git a/src/test/table/ExecutionContextTest.java b/src/test/table/ExecutionContextTest.java
index 068dbe4..ec950b4 100644
--- a/src/test/table/ExecutionContextTest.java
+++ b/src/test/table/ExecutionContextTest.java
@@ -1,5 +1,9 @@
 package table;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
@@ -7,10 +11,6 @@ import static org.junit.Assert.assertThat;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 public class ExecutionContextTest {
 
     private ExecutionContext executionContext;
diff --git a/src/test/table/FunctionTableTest.java b/src/test/table/FunctionTableTest.java
index ec1aec0..a02facb 100644
--- a/src/test/table/FunctionTableTest.java
+++ b/src/test/table/FunctionTableTest.java
@@ -1,5 +1,18 @@
 package table;
 
+import error.ErrorManager;
+import function.FunctionNames;
+import function.LispFunction;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import sexpression.Cons;
+import sexpression.SExpression;
+import table.FunctionTable.LispFunctionInstantiationException;
+
+import java.util.HashSet;
+import java.util.Set;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -12,20 +25,6 @@ import static table.FunctionTable.isAlreadyDefined;
 import static table.FunctionTable.lookupFunction;
 import static table.FunctionTable.resetFunctionTable;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import error.ErrorManager;
-import function.FunctionNames;
-import function.LispFunction;
-import sexpression.Cons;
-import sexpression.SExpression;
-import table.FunctionTable.LispFunctionInstantiationException;
-
 public class FunctionTableTest {
 
     @FunctionNames({ "GOOD" })
diff --git a/src/test/table/SymbolTableTest.java b/src/test/table/SymbolTableTest.java
index 444585a..21da004 100644
--- a/src/test/table/SymbolTableTest.java
+++ b/src/test/table/SymbolTableTest.java
@@ -1,14 +1,14 @@
 package table;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import org.junit.Before;
-import org.junit.Test;
-
 public class SymbolTableTest {
 
     private SymbolTable symbolTable;
diff --git a/src/test/terminal/ControlSequenceHandlerTest.java b/src/test/terminal/ControlSequenceHandlerTest.java
index ec40094..fc157d2 100644
--- a/src/test/terminal/ControlSequenceHandlerTest.java
+++ b/src/test/terminal/ControlSequenceHandlerTest.java
@@ -1,5 +1,12 @@
 package terminal;
 
+import org.junit.Before;
+import org.junit.Test;
+import stream.SafeInputStream;
+import terminal.ControlSequence.NullControlSequence;
+import testutil.TestUtilities;
+import util.Characters;
+
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -10,14 +17,6 @@ import static terminal.SelectGraphicRendition.RED;
 import static terminal.SelectGraphicRendition.RESET;
 import static terminal.SelectGraphicRendition.YELLOW;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import stream.SafeInputStream;
-import terminal.ControlSequence.NullControlSequence;
-import testutil.TestUtilities;
-import util.Characters;
-
 public class ControlSequenceHandlerTest {
 
     private ControlSequenceHandler handler;
diff --git a/src/test/terminal/ControlSequenceTest.java b/src/test/terminal/ControlSequenceTest.java
index d24a195..c6580a2 100644
--- a/src/test/terminal/ControlSequenceTest.java
+++ b/src/test/terminal/ControlSequenceTest.java
@@ -1,5 +1,15 @@
 package terminal;
 
+import com.googlecode.lanterna.TextColor;
+import com.googlecode.lanterna.terminal.virtual.DefaultVirtualTerminal;
+import com.googlecode.lanterna.terminal.virtual.VirtualTerminal;
+import org.junit.Before;
+import org.junit.Test;
+import terminal.ControlSequence.NullControlSequence;
+
+import java.util.HashSet;
+import java.util.Set;
+
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -10,18 +20,6 @@ import static terminal.SelectGraphicRendition.RED;
 import static terminal.SelectGraphicRendition.RESET;
 import static terminal.SelectGraphicRendition.YELLOW;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.googlecode.lanterna.TextColor;
-import com.googlecode.lanterna.terminal.virtual.DefaultVirtualTerminal;
-import com.googlecode.lanterna.terminal.virtual.VirtualTerminal;
-
-import terminal.ControlSequence.NullControlSequence;
-
 public class ControlSequenceTest {
 
     private Set<String> indicatorSet;
diff --git a/src/test/terminal/LispTerminalTest.java b/src/test/terminal/LispTerminalTest.java
index d4c3d5d..6e1df95 100644
--- a/src/test/terminal/LispTerminalTest.java
+++ b/src/test/terminal/LispTerminalTest.java
@@ -1,5 +1,9 @@
 package terminal;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import static com.googlecode.lanterna.input.KeyType.ArrowDown;
 import static com.googlecode.lanterna.input.KeyType.ArrowLeft;
 import static com.googlecode.lanterna.input.KeyType.ArrowRight;
@@ -10,10 +14,6 @@ import static com.googlecode.lanterna.input.KeyType.Enter;
 import static com.googlecode.lanterna.input.KeyType.Escape;
 import static terminal.LispTerminal.END_OF_SEGMENT;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 public class LispTerminalTest {
 
     private VirtualTerminalInteractor terminal;
diff --git a/src/test/terminal/TerminalConfigurationTest.java b/src/test/terminal/TerminalConfigurationTest.java
index 6909c05..729d9fd 100644
--- a/src/test/terminal/TerminalConfigurationTest.java
+++ b/src/test/terminal/TerminalConfigurationTest.java
@@ -1,14 +1,13 @@
 package terminal;
 
+import org.junit.Before;
+import org.junit.Test;
+import stream.UncheckedIOException;
+
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import stream.UncheckedIOException;
-
 public class TerminalConfigurationTest {
 
     TerminalConfiguration configuration;
diff --git a/src/test/terminal/TerminalHistoryTest.java b/src/test/terminal/TerminalHistoryTest.java
index dae6410..cebbeaf 100644
--- a/src/test/terminal/TerminalHistoryTest.java
+++ b/src/test/terminal/TerminalHistoryTest.java
@@ -1,12 +1,12 @@
 package terminal;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
 public class TerminalHistoryTest {
 
     private TerminalHistory history;
diff --git a/src/test/terminal/VirtualTerminalInteractor.java b/src/test/terminal/VirtualTerminalInteractor.java
index f605cd5..498842e 100644
--- a/src/test/terminal/VirtualTerminalInteractor.java
+++ b/src/test/terminal/VirtualTerminalInteractor.java
@@ -1,23 +1,22 @@
 package terminal;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static terminal.LispTerminal.END_OF_SEGMENT;
-
-import java.io.IOException;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
 import com.googlecode.lanterna.TerminalPosition;
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.input.KeyStroke;
 import com.googlecode.lanterna.input.KeyType;
 import com.googlecode.lanterna.terminal.virtual.DefaultVirtualTerminal;
 import com.googlecode.lanterna.terminal.virtual.VirtualTerminal;
-
 import stream.UncheckedIOException;
 
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static terminal.LispTerminal.END_OF_SEGMENT;
+
 public class VirtualTerminalInteractor {
 
     private PipedOutputStream inputWriter;
diff --git a/src/test/testutil/SymbolAndFunctionCleaner.java b/src/test/testutil/SymbolAndFunctionCleaner.java
index e04e4cf..cd96210 100644
--- a/src/test/testutil/SymbolAndFunctionCleaner.java
+++ b/src/test/testutil/SymbolAndFunctionCleaner.java
@@ -1,12 +1,11 @@
 package testutil;
 
-import static table.FunctionTable.resetFunctionTable;
-
 import org.junit.After;
 import org.junit.Before;
-
 import table.ExecutionContext;
 
+import static table.FunctionTable.resetFunctionTable;
+
 public abstract class SymbolAndFunctionCleaner {
 
     protected ExecutionContext executionContext;
diff --git a/src/test/testutil/TestUtilities.java b/src/test/testutil/TestUtilities.java
index 8ba750a..c7a9edf 100644
--- a/src/test/testutil/TestUtilities.java
+++ b/src/test/testutil/TestUtilities.java
@@ -1,5 +1,16 @@
 package testutil;
 
+import error.LispException;
+import parser.LispParser;
+import sexpression.Cons;
+import sexpression.SExpression;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+
 import static error.ErrorManager.Severity.ERROR;
 import static function.builtin.EVAL.eval;
 import static org.hamcrest.Matchers.is;
@@ -8,17 +19,6 @@ import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 import static sexpression.Nil.NIL;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-
-import error.LispException;
-import parser.LispParser;
-import sexpression.Cons;
-import sexpression.SExpression;
-
 public final class TestUtilities {
 
     public static InputStream createInputStreamFromString(String string) {
diff --git a/src/test/testutil/TypeAssertions.java b/src/test/testutil/TypeAssertions.java
index 3dc5bf9..09975ab 100644
--- a/src/test/testutil/TypeAssertions.java
+++ b/src/test/testutil/TypeAssertions.java
@@ -1,12 +1,12 @@
 package testutil;
 
+import sexpression.SExpression;
+
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import sexpression.SExpression;
-
 public final class TypeAssertions {
 
     public static void assertList(SExpression sExpression) {
diff --git a/src/test/token/TokenFactoryTest.java b/src/test/token/TokenFactoryTest.java
index b7bd7fe..e7a742f 100644
--- a/src/test/token/TokenFactoryTest.java
+++ b/src/test/token/TokenFactoryTest.java
@@ -1,5 +1,11 @@
 package token;
 
+import file.FilePosition;
+import org.junit.Before;
+import org.junit.Test;
+import token.TokenFactory.BadCharacterException;
+import token.TokenFactory.EmptyTokenTextException;
+
 import static error.ErrorManager.Severity.CRITICAL;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.instanceOf;
@@ -7,13 +13,6 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import file.FilePosition;
-import token.TokenFactory.BadCharacterException;
-import token.TokenFactory.EmptyTokenTextException;
-
 public class TokenFactoryTest {
 
     private TokenFactory tokenFactory;
diff --git a/src/test/util/CharactersTest.java b/src/test/util/CharactersTest.java
index fd5338a..a0c4907 100644
--- a/src/test/util/CharactersTest.java
+++ b/src/test/util/CharactersTest.java
@@ -1,12 +1,12 @@
 package util;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Test;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
-import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
 
 public class CharactersTest {
 
diff --git a/src/test/util/PathTest.java b/src/test/util/PathTest.java
index 5b16a5c..64ee966 100644
--- a/src/test/util/PathTest.java
+++ b/src/test/util/PathTest.java
@@ -1,12 +1,12 @@
 package util;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Test;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
-import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
 
 public class PathTest {
 

From a25141a9b13c2b0969c23a55908d7c4192a42708 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 14:18:02 -0400
Subject: [PATCH 06/16] Refactor source directories again

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

diff --git a/pom.xml b/pom.xml
index e13676f..827788e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,10 @@
   <version>1.2.0</version>
 
   <build>
-    <sourceDirectory>src/main</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <!--<sourceDirectory>src/main/kotlin</sourceDirectory>-->
+    <testSourceDirectory>src/test/java</testSourceDirectory>
+    <!--<testSourceDirectory>src/test/kotlin</testSourceDirectory>-->
 
     <resources>
       <resource>
@@ -18,14 +20,14 @@
       </resource>
     </resources>
 
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
+    <!--<testResources>-->
+      <!--<testResource>-->
+        <!--<directory>src/test</directory>-->
+        <!--<excludes>-->
+          <!--<exclude>**/*.java</exclude>-->
+        <!--</excludes>-->
+      <!--</testResource>-->
+    <!--</testResources>-->
 
     <plugins>
       <plugin>
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

From 60e348449ba29f23d2a7cfeeb5d9d6e9137f26e3 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 14:19:19 -0400
Subject: [PATCH 07/16] Move resource folders

---
 pom.xml                                          | 15 ---------------
 {lisp/lang => src/main/resources}/dlambda.lisp   |  0
 {lisp/lang => src/main/resources}/functions.lisp |  0
 3 files changed, 15 deletions(-)
 rename {lisp/lang => src/main/resources}/dlambda.lisp (100%)
 rename {lisp/lang => src/main/resources}/functions.lisp (100%)

diff --git a/pom.xml b/pom.xml
index 827788e..4d60127 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,21 +14,6 @@
     <testSourceDirectory>src/test/java</testSourceDirectory>
     <!--<testSourceDirectory>src/test/kotlin</testSourceDirectory>-->
 
-    <resources>
-      <resource>
-        <directory>lisp/lang</directory>
-      </resource>
-    </resources>
-
-    <!--<testResources>-->
-      <!--<testResource>-->
-        <!--<directory>src/test</directory>-->
-        <!--<excludes>-->
-          <!--<exclude>**/*.java</exclude>-->
-        <!--</excludes>-->
-      <!--</testResource>-->
-    <!--</testResources>-->
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/lisp/lang/dlambda.lisp b/src/main/resources/dlambda.lisp
similarity index 100%
rename from lisp/lang/dlambda.lisp
rename to src/main/resources/dlambda.lisp
diff --git a/lisp/lang/functions.lisp b/src/main/resources/functions.lisp
similarity index 100%
rename from lisp/lang/functions.lisp
rename to src/main/resources/functions.lisp

From b67071a7f22de110ca546f1c74e972db26b7f176 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 14:37:02 -0400
Subject: [PATCH 08/16] Move test resources

---
 src/test/java/application/MainTest.java                |  8 ++++----
 src/test/java/function/builtin/LOADTest.java           | 10 +++++-----
 src/test/java/interpreter/LispInterpreterTest.java     |  2 +-
 .../test-files => resources/application}/file.lisp     |  0
 .../function/builtin}/load-bad.lisp                    |  0
 .../function/builtin}/load-good.lisp                   |  0
 .../function/builtin}/nested/included.lisp             |  0
 .../function/builtin}/nested/nested.lisp               |  0
 .../function/builtin}/nested/one/load-one.lisp         |  0
 .../function/builtin}/nested/one/two/load-two.lisp     |  0
 .../builtin}/nested/one/two/three/load-three.lisp      |  0
 .../test-files => resources/interpreter}/file.lisp     |  0
 12 files changed, 10 insertions(+), 10 deletions(-)
 rename src/test/{java/application/test-files => resources/application}/file.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/load-bad.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/load-good.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/nested/included.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/nested/nested.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/nested/one/load-one.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/nested/one/two/load-two.lisp (100%)
 rename src/test/{java/function/builtin/test-files => resources/function/builtin}/nested/one/two/three/load-three.lisp (100%)
 rename src/test/{java/interpreter/test-files => resources/interpreter}/file.lisp (100%)

diff --git a/src/test/java/application/MainTest.java b/src/test/java/application/MainTest.java
index 6488e87..2d70b38 100644
--- a/src/test/java/application/MainTest.java
+++ b/src/test/java/application/MainTest.java
@@ -99,7 +99,7 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void runWithBadFile() {
-        String expectedMessage = "[critical] src/test/application/test-files/bad.lisp (No such file or directory)";
+        String expectedMessage = "[critical] src/test/resources/application/bad.lisp (No such file or directory)";
 
         exit.expectSystemExitWithStatus(1);
         exit.checkAssertionAfterwards(() -> {
@@ -107,12 +107,12 @@ public class MainTest extends SymbolAndFunctionCleaner {
             assertEquals("", getSystemOutLog());
         });
 
-        runInterpreterWithFile("src/test/application/test-files/bad.lisp");
+        runInterpreterWithFile("src/test/resources/application/bad.lisp");
     }
 
     @Test
     public void runWithFile_PrintsDecoratedLastValueOnly() {
-        runInterpreterWithFile("src/test/application/test-files/file.lisp");
+        runInterpreterWithFile("src/test/resources/application/file.lisp");
 
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
@@ -136,7 +136,7 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void runMain() {
-        LispMain.main(new String[] { "src/test/application/test-files/file.lisp" });
+        LispMain.main(new String[] { "src/test/resources/application/file.lisp" });
 
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
diff --git a/src/test/java/function/builtin/LOADTest.java b/src/test/java/function/builtin/LOADTest.java
index f8c150f..fb21610 100644
--- a/src/test/java/function/builtin/LOADTest.java
+++ b/src/test/java/function/builtin/LOADTest.java
@@ -70,7 +70,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadGoodFile_ReturnsTAndPrintsNothing() {
-        String input = "(load \"src/test/function/builtin/test-files/load-good.lisp\")";
+        String input = "(load \"src/test/resources/function/builtin/load-good.lisp\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -78,7 +78,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadBadFile_ReturnsNilAndPrintsError() {
-        String input = "(load \"src/test/function/builtin/test-files/load-bad.lisp\")";
+        String input = "(load \"src/test/resources/function/builtin/load-bad.lisp\")";
 
         assertNil(evaluateString(input));
         assertErrorMessagePrinted();
@@ -94,7 +94,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void nestedLoadsInTheSameDirectory() {
-        String input = "(load \"src/test/function/builtin/test-files/nested/nested.lisp\")";
+        String input = "(load \"src/test/resources/function/builtin/nested/nested.lisp\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -102,7 +102,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void nestedLoadsInDifferentDirectories() {
-        String input = "(load \"src/test/function/builtin/test-files/nested/one/load-one.lisp\")";
+        String input = "(load \"src/test/resources/function/builtin/nested/one/load-one.lisp\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -125,7 +125,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadUsesRuntimePath() {
-        environment.setPath("src/test/function/builtin/test-files/nested/one/");
+        environment.setPath("src/test/resources/function/builtin/nested/one/");
         String input = "(load \"load-one.lisp\")";
 
         assertT(evaluateString(input));
diff --git a/src/test/java/interpreter/LispInterpreterTest.java b/src/test/java/interpreter/LispInterpreterTest.java
index e1aee0e..b6987ee 100644
--- a/src/test/java/interpreter/LispInterpreterTest.java
+++ b/src/test/java/interpreter/LispInterpreterTest.java
@@ -165,7 +165,7 @@ public class LispInterpreterTest {
     @Test
     public void fileBasedInterpreterWorks_PrintsLastValueOnly() {
         setCommonFeatures();
-        builder.useFile("src/test/interpreter/test-files/file.lisp");
+        builder.useFile("src/test/resources/interpreter/file.lisp");
         builder.build().interpret();
 
         assertEquals("PICKLE\n\n", outputStream.toString());
diff --git a/src/test/java/application/test-files/file.lisp b/src/test/resources/application/file.lisp
similarity index 100%
rename from src/test/java/application/test-files/file.lisp
rename to src/test/resources/application/file.lisp
diff --git a/src/test/java/function/builtin/test-files/load-bad.lisp b/src/test/resources/function/builtin/load-bad.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/load-bad.lisp
rename to src/test/resources/function/builtin/load-bad.lisp
diff --git a/src/test/java/function/builtin/test-files/load-good.lisp b/src/test/resources/function/builtin/load-good.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/load-good.lisp
rename to src/test/resources/function/builtin/load-good.lisp
diff --git a/src/test/java/function/builtin/test-files/nested/included.lisp b/src/test/resources/function/builtin/nested/included.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/nested/included.lisp
rename to src/test/resources/function/builtin/nested/included.lisp
diff --git a/src/test/java/function/builtin/test-files/nested/nested.lisp b/src/test/resources/function/builtin/nested/nested.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/nested/nested.lisp
rename to src/test/resources/function/builtin/nested/nested.lisp
diff --git a/src/test/java/function/builtin/test-files/nested/one/load-one.lisp b/src/test/resources/function/builtin/nested/one/load-one.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/nested/one/load-one.lisp
rename to src/test/resources/function/builtin/nested/one/load-one.lisp
diff --git a/src/test/java/function/builtin/test-files/nested/one/two/load-two.lisp b/src/test/resources/function/builtin/nested/one/two/load-two.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/nested/one/two/load-two.lisp
rename to src/test/resources/function/builtin/nested/one/two/load-two.lisp
diff --git a/src/test/java/function/builtin/test-files/nested/one/two/three/load-three.lisp b/src/test/resources/function/builtin/nested/one/two/three/load-three.lisp
similarity index 100%
rename from src/test/java/function/builtin/test-files/nested/one/two/three/load-three.lisp
rename to src/test/resources/function/builtin/nested/one/two/three/load-three.lisp
diff --git a/src/test/java/interpreter/test-files/file.lisp b/src/test/resources/interpreter/file.lisp
similarity index 100%
rename from src/test/java/interpreter/test-files/file.lisp
rename to src/test/resources/interpreter/file.lisp

From 74fba08555b4117526b6c79222e32de44ccaacda Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 16:18:26 -0400
Subject: [PATCH 09/16] Use resource loader for test files

---
 pom.xml                                            |  2 --
 src/test/java/application/MainTest.java            | 10 ++++++----
 src/test/java/function/builtin/LOADTest.java       | 14 +++++++++-----
 src/test/java/interpreter/LispInterpreterTest.java |  7 ++++---
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4d60127..f32c555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,7 @@
   <version>1.2.0</version>
 
   <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
     <!--<sourceDirectory>src/main/kotlin</sourceDirectory>-->
-    <testSourceDirectory>src/test/java</testSourceDirectory>
     <!--<testSourceDirectory>src/test/kotlin</testSourceDirectory>-->
 
     <plugins>
diff --git a/src/test/java/application/MainTest.java b/src/test/java/application/MainTest.java
index 2d70b38..49a9770 100644
--- a/src/test/java/application/MainTest.java
+++ b/src/test/java/application/MainTest.java
@@ -26,6 +26,8 @@ import static org.junit.Assert.assertEquals;
 
 public class MainTest extends SymbolAndFunctionCleaner {
 
+    private static final String FILE = MainTest.class.getResource("file.lisp").getFile();
+
     private RuntimeEnvironment environment;
     private CountDownLatch latch;
 
@@ -99,7 +101,7 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void runWithBadFile() {
-        String expectedMessage = "[critical] src/test/resources/application/bad.lisp (No such file or directory)";
+        String expectedMessage = "[critical] bad.lisp (No such file or directory)";
 
         exit.expectSystemExitWithStatus(1);
         exit.checkAssertionAfterwards(() -> {
@@ -107,12 +109,12 @@ public class MainTest extends SymbolAndFunctionCleaner {
             assertEquals("", getSystemOutLog());
         });
 
-        runInterpreterWithFile("src/test/resources/application/bad.lisp");
+        runInterpreterWithFile("bad.lisp");
     }
 
     @Test
     public void runWithFile_PrintsDecoratedLastValueOnly() {
-        runInterpreterWithFile("src/test/resources/application/file.lisp");
+        runInterpreterWithFile(FILE);
 
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
@@ -136,7 +138,7 @@ public class MainTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void runMain() {
-        LispMain.main(new String[] { "src/test/resources/application/file.lisp" });
+        LispMain.main(new String[] { FILE });
 
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
diff --git a/src/test/java/function/builtin/LOADTest.java b/src/test/java/function/builtin/LOADTest.java
index fb21610..ae67a2b 100644
--- a/src/test/java/function/builtin/LOADTest.java
+++ b/src/test/java/function/builtin/LOADTest.java
@@ -70,7 +70,8 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadGoodFile_ReturnsTAndPrintsNothing() {
-        String input = "(load \"src/test/resources/function/builtin/load-good.lisp\")";
+        String file = LOADTest.class.getResource("load-good.lisp").getFile();
+        String input = "(load \"" + file + "\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -78,7 +79,8 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadBadFile_ReturnsNilAndPrintsError() {
-        String input = "(load \"src/test/resources/function/builtin/load-bad.lisp\")";
+        String file = LOADTest.class.getResource("load-bad.lisp").getFile();
+        String input = "(load \"" + file + "\")";
 
         assertNil(evaluateString(input));
         assertErrorMessagePrinted();
@@ -94,7 +96,8 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void nestedLoadsInTheSameDirectory() {
-        String input = "(load \"src/test/resources/function/builtin/nested/nested.lisp\")";
+        String file = LOADTest.class.getResource("nested/nested.lisp").getFile();
+        String input = "(load \"" + file + "\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -102,7 +105,8 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void nestedLoadsInDifferentDirectories() {
-        String input = "(load \"src/test/resources/function/builtin/nested/one/load-one.lisp\")";
+        String file = LOADTest.class.getResource("nested/one/load-one.lisp").getFile();
+        String input = "(load \"" + file + "\")";
 
         assertT(evaluateString(input));
         assertNothingPrinted();
@@ -125,7 +129,7 @@ public class LOADTest extends SymbolAndFunctionCleaner {
 
     @Test
     public void loadUsesRuntimePath() {
-        environment.setPath("src/test/resources/function/builtin/nested/one/");
+        environment.setPath(LOADTest.class.getResource("nested/one/").getPath());
         String input = "(load \"load-one.lisp\")";
 
         assertT(evaluateString(input));
diff --git a/src/test/java/interpreter/LispInterpreterTest.java b/src/test/java/interpreter/LispInterpreterTest.java
index b6987ee..0619a27 100644
--- a/src/test/java/interpreter/LispInterpreterTest.java
+++ b/src/test/java/interpreter/LispInterpreterTest.java
@@ -23,6 +23,7 @@ import static testutil.TestUtilities.createInputStreamFromString;
 public class LispInterpreterTest {
 
     private static final String TERMINATED = "terminated";
+    private static final String FILE = LispInterpreterTest.class.getResource("file.lisp").getFile();
 
     private Set<String> indicatorSet;
     private ByteArrayOutputStream outputStream;
@@ -95,7 +96,7 @@ public class LispInterpreterTest {
     @Test
     public void buildFileBasedInterpreter() {
         setCommonFeatures();
-        builder.useFile("src/test/interpreter/test-files/file.lisp");
+        builder.useFile(FILE);
         LispInterpreter interpreter = builder.build();
 
         assertTrue(interpreter instanceof FileLispInterpreter);
@@ -128,7 +129,7 @@ public class LispInterpreterTest {
     @Test
     public void attemptToBuildInterpreterOnBadFile() {
         setCommonFeatures();
-        builder.useFile("src/test/interpreter/test-files/does-not-exist.lisp");
+        builder.useFile("does-not-exist.lisp");
         builder.build();
 
         assertErrorMessageWritten();
@@ -165,7 +166,7 @@ public class LispInterpreterTest {
     @Test
     public void fileBasedInterpreterWorks_PrintsLastValueOnly() {
         setCommonFeatures();
-        builder.useFile("src/test/resources/interpreter/file.lisp");
+        builder.useFile(FILE);
         builder.build().interpret();
 
         assertEquals("PICKLE\n\n", outputStream.toString());

From 182ff9f5e613c69b2c327eb972f4b5017c9046ce Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 16:31:44 -0400
Subject: [PATCH 10/16] Update test run configuration

---
 .idea/runConfigurations/Test.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
index 82d89d4..0c0fc6e 100644
--- a/.idea/runConfigurations/Test.xml
+++ b/.idea/runConfigurations/Test.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test" type="JUnit" factoryName="JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="" />
+    <module name="transcendental-lisp" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
@@ -10,13 +10,14 @@
     <option name="TEST_OBJECT" value="package" />
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+    <option name="WORKING_DIRECTORY" value="file://%MODULE_WORKING_DIR%" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
+      <value defaultName="singleModule" />
     </option>
     <envs />
+    <dir value="$PROJECT_DIR$/src/test/java" />
     <patterns />
     <method />
   </configuration>

From 5f0cb1aa869088aa34c41e00f602e0db04833284 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sun, 18 Mar 2018 11:39:01 -0400
Subject: [PATCH 11/16] Convert one class to kotlin

---
 .idea/ClojureProjectResolveSettings.xml       |  6 ++
 .idea/codeStyles/Project.xml                  | 27 +++++++
 .idea/codeStyles/codeStyleConfig.xml          |  2 +-
 pom.xml                                       | 76 +++++++++++++++++--
 src/main/java/function/builtin/EVAL.java      |  7 +-
 .../java/function/builtin/special/LAMBDA.java | 69 -----------------
 .../java/function/builtin/special/LAMBDA.kt   | 68 +++++++++++++++++
 .../function/builtin/special/LAMBDATest.java  | 10 +--
 8 files changed, 179 insertions(+), 86 deletions(-)
 create mode 100644 .idea/ClojureProjectResolveSettings.xml
 delete mode 100644 src/main/java/function/builtin/special/LAMBDA.java
 create mode 100644 src/main/java/function/builtin/special/LAMBDA.kt

diff --git a/.idea/ClojureProjectResolveSettings.xml b/.idea/ClojureProjectResolveSettings.xml
new file mode 100644
index 0000000..df470b1
--- /dev/null
+++ b/.idea/ClojureProjectResolveSettings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ClojureProjectResolveSettings">
+    <currentScheme>IDE</currentScheme>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a2d49a1..6f0bc46 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -18,6 +18,17 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="IMPORT_NESTED_CLASSES" value="true" />
+      <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
+      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
+    </JetCodeStyleSettings>
     <XML>
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
@@ -60,5 +71,21 @@
         <option name="INDENT_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="5" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="5" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123..940db4f 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mike" />
   </state>
 </component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f32c555..0e0b4d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,10 +8,12 @@
   <artifactId>transcendental-lisp</artifactId>
   <version>1.2.0</version>
 
-  <build>
-    <!--<sourceDirectory>src/main/kotlin</sourceDirectory>-->
-    <!--<testSourceDirectory>src/test/kotlin</testSourceDirectory>-->
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <kotlin.version>1.2.30</kotlin.version>
+  </properties>
 
+  <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -25,10 +27,61 @@
         <version>3.0.2</version>
       </plugin>
 
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <version>${kotlin.version}</version>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jvmTarget>1.8</jvmTarget>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.7.0</version>
+        <executions>
+          <!-- Replacing default-compile as it is treated specially by maven -->
+          <execution>
+            <id>default-compile</id>
+            <phase>none</phase>
+          </execution>
+          <!-- Replacing default-testCompile as it is treated specially by maven -->
+          <execution>
+            <id>default-testCompile</id>
+            <phase>none</phase>
+          </execution>
+          <execution>
+            <id>java-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>java-test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -79,12 +132,25 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.googlecode.lanterna</groupId>
       <artifactId>lanterna</artifactId>
       <version>3.0.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -114,8 +180,4 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
 </project>
\ No newline at end of file
diff --git a/src/main/java/function/builtin/EVAL.java b/src/main/java/function/builtin/EVAL.java
index fb56914..0a2d576 100644
--- a/src/main/java/function/builtin/EVAL.java
+++ b/src/main/java/function/builtin/EVAL.java
@@ -4,6 +4,7 @@ import error.LispException;
 import function.ArgumentValidator;
 import function.FunctionNames;
 import function.LispFunction;
+import function.builtin.special.LAMBDA;
 import function.builtin.special.RECUR.RecurNotInTailPositionException;
 import sexpression.BackquoteExpression;
 import sexpression.Cons;
@@ -13,8 +14,6 @@ import sexpression.Symbol;
 import table.ExecutionContext;
 
 import static function.builtin.cons.LIST.makeList;
-import static function.builtin.special.LAMBDA.createFunction;
-import static function.builtin.special.LAMBDA.isLambdaExpression;
 import static java.text.MessageFormat.format;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
@@ -60,8 +59,8 @@ public class EVAL extends LispFunction {
     private static LispFunction createLambdaFunction(SExpression lambdaExpression) {
         if (lambdaExpression.isFunction())
             return ((LambdaExpression) lambdaExpression).getFunction();
-        else if (isLambdaExpression(lambdaExpression))
-            return createFunction((Cons) lambdaExpression);
+        else if (LAMBDA.Companion.isLambdaExpression(lambdaExpression))
+            return LAMBDA.Companion.createFunction((Cons) lambdaExpression);
         else
             throw new UndefinedFunctionException(lambdaExpression);
     }
diff --git a/src/main/java/function/builtin/special/LAMBDA.java b/src/main/java/function/builtin/special/LAMBDA.java
deleted file mode 100644
index f4f70a3..0000000
--- a/src/main/java/function/builtin/special/LAMBDA.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package function.builtin.special;
-
-import function.ArgumentValidator;
-import function.FunctionNames;
-import function.LispSpecialFunction;
-import function.UserDefinedFunction;
-import sexpression.Cons;
-import sexpression.LambdaExpression;
-import sexpression.SExpression;
-import sexpression.Symbol;
-
-import static function.builtin.cons.LIST.makeList;
-
-@FunctionNames({ "LAMBDA", "Λ" })
-public class LAMBDA extends LispSpecialFunction {
-
-    public static boolean isLambdaExpression(SExpression sexpr) {
-        if (sexpr.isCons()) {
-            String first = ((Cons) sexpr).getFirst().toString();
-
-            return "LAMBDA".equals(first) || "Λ".equals(first);
-        }
-
-        return false;
-    }
-
-    public static UserDefinedFunction createFunction(Cons lambdaExpression) {
-        SExpression rest = lambdaExpression.getRest();
-
-        ArgumentValidator lambdaValidator = new ArgumentValidator("LAMBDA|create|");
-        lambdaValidator.setEveryArgumentExpectedType(Cons.class);
-        lambdaValidator.validate(makeList(rest));
-
-        LambdaExpression lambda = new LAMBDA("LAMBDA").call((Cons) rest);
-
-        return lambda.getFunction();
-    }
-
-    private ArgumentValidator argumentValidator;
-    private ArgumentValidator lambdaListValidator;
-
-    public LAMBDA(String name) {
-        this.argumentValidator = new ArgumentValidator(name);
-        this.argumentValidator.setFirstArgumentExpectedType(Cons.class);
-        this.argumentValidator.setMinimumNumberOfArguments(1);
-
-        this.lambdaListValidator = new ArgumentValidator(name + "|lambda-list|");
-        this.lambdaListValidator.setEveryArgumentExpectedType(Symbol.class);
-    }
-
-    @Override
-    public LambdaExpression call(Cons argumentList) {
-        argumentValidator.validate(argumentList);
-
-        SExpression first = argumentList.getFirst();
-        Cons lambdaList = (Cons) first;
-        Cons body = (Cons) argumentList.getRest();
-
-        lambdaListValidator.validate(lambdaList);
-
-        UserDefinedFunction function = new UserDefinedFunction(":LAMBDA", lambdaList, body);
-
-        return new LambdaExpression(makeOriginalLambdaExpression(argumentList), function);
-    }
-
-    private Cons makeOriginalLambdaExpression(Cons argumentList) {
-        return new Cons(new Symbol("LAMBDA"), argumentList);
-    }
-}
diff --git a/src/main/java/function/builtin/special/LAMBDA.kt b/src/main/java/function/builtin/special/LAMBDA.kt
new file mode 100644
index 0000000..262e995
--- /dev/null
+++ b/src/main/java/function/builtin/special/LAMBDA.kt
@@ -0,0 +1,68 @@
+package function.builtin.special
+
+import function.ArgumentValidator
+import function.FunctionNames
+import function.LispSpecialFunction
+import function.UserDefinedFunction
+import function.builtin.cons.LIST.makeList
+import sexpression.Cons
+import sexpression.LambdaExpression
+import sexpression.SExpression
+import sexpression.Symbol
+
+@FunctionNames("LAMBDA", "Λ")
+class LAMBDA(name: String) : LispSpecialFunction() {
+
+
+    private val argumentValidator: ArgumentValidator = ArgumentValidator(name)
+    private val lambdaListValidator: ArgumentValidator = ArgumentValidator("$name|lambda-list|")
+
+    init {
+        this.argumentValidator.setFirstArgumentExpectedType(Cons::class.java)
+        this.argumentValidator.setMinimumNumberOfArguments(1)
+        this.lambdaListValidator.setEveryArgumentExpectedType(Symbol::class.java)
+    }
+
+    override fun call(argumentList: Cons): LambdaExpression {
+        argumentValidator.validate(argumentList)
+
+        val first = argumentList.first
+        val lambdaList = first as Cons
+        val body = argumentList.rest as Cons
+
+        lambdaListValidator.validate(lambdaList)
+
+        val function = UserDefinedFunction(":LAMBDA", lambdaList, body)
+
+        return LambdaExpression(makeOriginalLambdaExpression(argumentList), function)
+    }
+
+    private fun makeOriginalLambdaExpression(argumentList: Cons): Cons {
+        return Cons(Symbol("LAMBDA"), argumentList)
+    }
+
+    companion object {
+
+        fun isLambdaExpression(sexpr: SExpression): Boolean {
+            if (sexpr.isCons) {
+                val first = (sexpr as Cons).first.toString()
+
+                return "LAMBDA" == first || "Λ" == first
+            }
+
+            return false
+        }
+
+        fun createFunction(lambdaExpression: Cons): UserDefinedFunction {
+            val rest = lambdaExpression.rest
+
+            val lambdaValidator = ArgumentValidator("LAMBDA|create|")
+            lambdaValidator.setEveryArgumentExpectedType(Cons::class.java)
+            lambdaValidator.validate(makeList(rest))
+
+            val lambda = LAMBDA("LAMBDA").call(rest as Cons)
+
+            return lambda.function
+        }
+    }
+}
diff --git a/src/test/java/function/builtin/special/LAMBDATest.java b/src/test/java/function/builtin/special/LAMBDATest.java
index 539793d..d36a56d 100644
--- a/src/test/java/function/builtin/special/LAMBDATest.java
+++ b/src/test/java/function/builtin/special/LAMBDATest.java
@@ -47,12 +47,12 @@ public class LAMBDATest extends SymbolAndFunctionCleaner {
     public void lambdaExpressionIsLambdaExpression() {
         Cons lambdaExpression = new Cons(new Symbol("LAMBDA"), new Cons(NIL, new Cons(NIL, NIL)));
 
-        assertTrue(LAMBDA.isLambdaExpression(lambdaExpression));
+        assertTrue(LAMBDA.Companion.isLambdaExpression(lambdaExpression));
     }
 
     @Test
     public void somethingElseIsNotLambdaExpression() {
-        assertFalse(LAMBDA.isLambdaExpression(T));
+        assertFalse(LAMBDA.Companion.isLambdaExpression(T));
     }
 
     @Test
@@ -60,7 +60,7 @@ public class LAMBDATest extends SymbolAndFunctionCleaner {
         Cons lambdaExpression = new Cons(new Symbol("LAMBDA"), new Cons(NIL, new Cons(NIL, NIL)));
 
         assertSExpressionsMatch(parseString("(:LAMBDA () ())"),
-                                LAMBDA.createFunction(lambdaExpression).getLambdaExpression());
+                                LAMBDA.Companion.createFunction(lambdaExpression).getLambdaExpression());
     }
 
     @Test(expected = DottedArgumentListException.class)
@@ -81,14 +81,14 @@ public class LAMBDATest extends SymbolAndFunctionCleaner {
     public void createFunctionWithDottedArgumentList() {
         Cons lambdaExpression = new Cons(new Symbol("LAMBDA"), new Cons(NIL, ONE));
 
-        LAMBDA.createFunction(lambdaExpression);
+        LAMBDA.Companion.createFunction(lambdaExpression);
     }
 
     @Test(expected = BadArgumentTypeException.class)
     public void createFunctionWithNonList() {
         Cons lambdaExpression = new Cons(new Symbol("LAMBDA"), ONE);
 
-        LAMBDA.createFunction(lambdaExpression);
+        LAMBDA.Companion.createFunction(lambdaExpression);
     }
 
     @Test(expected = BadArgumentTypeException.class)

From 0fb64f0a2de8993ac9443346d28bfc7e19181f41 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sun, 18 Mar 2018 12:45:57 -0400
Subject: [PATCH 12/16] Convert error classes to kotlin

---
 .idea/codeStyles/Project.xml                  |  1 +
 .../error/CriticalLineColumnException.java    | 20 ----
 .../java/error/CriticalLineColumnException.kt |  9 ++
 .../java/error/CriticalLispException.java     | 15 ---
 src/main/java/error/CriticalLispException.kt  |  8 ++
 src/main/java/error/ErrorManager.java         | 95 -------------------
 src/main/java/error/ErrorManager.kt           | 41 ++++++++
 src/main/java/error/LineColumnException.java  | 25 -----
 src/main/java/error/LineColumnException.kt    | 12 +++
 src/main/java/error/LispException.java        | 14 ---
 src/main/java/error/LispException.kt          |  8 ++
 src/main/java/error/LispWarning.java          | 15 ---
 src/main/java/error/LispWarning.kt            |  8 ++
 src/main/java/error/Severity.kt               | 31 ++++++
 src/test/java/error/ErrorManagerTest.java     |  7 +-
 .../java/function/ArgumentValidatorTest.java  |  2 +-
 .../function/UserDefinedFunctionTest.java     |  4 +-
 .../function/builtin/SYMBOL_FUNCTIONTest.java |  2 +-
 .../java/interpreter/LispInterpreterTest.java |  2 +-
 src/test/java/parser/LispParserTest.java      |  2 +-
 .../LispCommentRemovingInputStreamTest.java   |  2 +-
 .../java/scanner/LispScannerTypeTest.java     |  2 +-
 .../java/sexpression/SExpressionTest.java     |  2 +-
 src/test/java/table/FunctionTableTest.java    |  4 +-
 src/test/java/testutil/TestUtilities.java     |  2 +-
 src/test/java/token/TokenFactoryTest.java     |  2 +-
 26 files changed, 134 insertions(+), 201 deletions(-)
 delete mode 100644 src/main/java/error/CriticalLineColumnException.java
 create mode 100644 src/main/java/error/CriticalLineColumnException.kt
 delete mode 100644 src/main/java/error/CriticalLispException.java
 create mode 100644 src/main/java/error/CriticalLispException.kt
 delete mode 100644 src/main/java/error/ErrorManager.java
 create mode 100644 src/main/java/error/ErrorManager.kt
 delete mode 100644 src/main/java/error/LineColumnException.java
 create mode 100644 src/main/java/error/LineColumnException.kt
 delete mode 100644 src/main/java/error/LispException.java
 create mode 100644 src/main/java/error/LispException.kt
 delete mode 100644 src/main/java/error/LispWarning.java
 create mode 100644 src/main/java/error/LispWarning.kt
 create mode 100644 src/main/java/error/Severity.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6f0bc46..2293d97 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -26,6 +26,7 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="IMPORT_NESTED_CLASSES" value="true" />
+      <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />
       <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
       <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </JetCodeStyleSettings>
diff --git a/src/main/java/error/CriticalLineColumnException.java b/src/main/java/error/CriticalLineColumnException.java
deleted file mode 100644
index def6e1e..0000000
--- a/src/main/java/error/CriticalLineColumnException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package error;
-
-import error.ErrorManager.Severity;
-import file.FilePosition;
-
-import static error.ErrorManager.Severity.CRITICAL;
-
-public abstract class CriticalLineColumnException extends LineColumnException {
-
-    private static final long serialVersionUID = 1L;
-
-    public CriticalLineColumnException(FilePosition position) {
-        super(position);
-    }
-
-    @Override
-    public Severity getSeverity() {
-        return CRITICAL;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/error/CriticalLineColumnException.kt b/src/main/java/error/CriticalLineColumnException.kt
new file mode 100644
index 0000000..5ef408c
--- /dev/null
+++ b/src/main/java/error/CriticalLineColumnException.kt
@@ -0,0 +1,9 @@
+package error
+
+import error.Severity.CRITICAL
+import file.FilePosition
+
+abstract class CriticalLineColumnException(position: FilePosition) : LineColumnException(position) {
+
+    override val severity = CRITICAL
+}
\ No newline at end of file
diff --git a/src/main/java/error/CriticalLispException.java b/src/main/java/error/CriticalLispException.java
deleted file mode 100644
index 7707f25..0000000
--- a/src/main/java/error/CriticalLispException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package error;
-
-import error.ErrorManager.Severity;
-
-import static error.ErrorManager.Severity.CRITICAL;
-
-public abstract class CriticalLispException extends LispException {
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public Severity getSeverity() {
-        return CRITICAL;
-    }
-}
diff --git a/src/main/java/error/CriticalLispException.kt b/src/main/java/error/CriticalLispException.kt
new file mode 100644
index 0000000..69e9a6c
--- /dev/null
+++ b/src/main/java/error/CriticalLispException.kt
@@ -0,0 +1,8 @@
+package error
+
+import error.Severity.CRITICAL
+
+abstract class CriticalLispException : LispException() {
+
+    override val severity = CRITICAL
+}
diff --git a/src/main/java/error/ErrorManager.java b/src/main/java/error/ErrorManager.java
deleted file mode 100644
index 8875809..0000000
--- a/src/main/java/error/ErrorManager.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package error;
-
-import environment.RuntimeEnvironment;
-
-import java.io.PrintStream;
-
-import static error.ErrorManager.Severity.CRITICAL;
-import static error.ErrorManager.Severity.WARNING;
-import static java.text.MessageFormat.format;
-
-/**
- * Prints error messages and potentially terminates the application.
- */
-public class ErrorManager {
-
-    private RuntimeEnvironment environment;
-
-    public ErrorManager() {
-        this.environment = RuntimeEnvironment.getInstance();
-    }
-
-    public void handle(LispException lispException) {
-        printMessage(lispException);
-
-        if (isCritical(lispException))
-            environment.terminateExceptionally();
-    }
-
-    private void printMessage(LispException lispException) {
-        PrintStream output = selectOutputStream(lispException.getSeverity());
-        output.println(formatMessage(lispException));
-    }
-
-    private PrintStream selectOutputStream(Severity severity) {
-        if (severity == WARNING)
-            return environment.getOutput();
-
-        return environment.getErrorOutput();
-    }
-
-    private String formatMessage(LispException lispException) {
-        Severity severity = lispException.getSeverity();
-        String prefix = severity.toDisplayString();
-        String message = format("[{0}] {1}", prefix, lispException.getMessage());
-
-        return severity.decorate(message, environment);
-    }
-
-    private boolean isCritical(LispException lispException) {
-        return lispException.getSeverity() == CRITICAL;
-    }
-
-    public static enum Severity {
-
-        WARNING {
-            @Override
-            public String decorate(String warningOutput, RuntimeEnvironment environment) {
-                return environment.decorateWarningOutput(warningOutput);
-            }
-
-            @Override
-            public String toDisplayString() {
-                return "warning";
-            }
-        },
-
-        ERROR {
-            @Override
-            public String decorate(String errorOutput, RuntimeEnvironment environment) {
-                return environment.decorateErrorOutput(errorOutput);
-            }
-
-            @Override
-            public String toDisplayString() {
-                return "error";
-            }
-        },
-
-        CRITICAL {
-            @Override
-            public String decorate(String criticalOutput, RuntimeEnvironment environment) {
-                return environment.decorateCriticalOutput(criticalOutput);
-            }
-
-            @Override
-            public String toDisplayString() {
-                return "critical";
-            }
-        };
-
-        public abstract String decorate(String output, RuntimeEnvironment environment);
-
-        public abstract String toDisplayString();
-    }
-}
diff --git a/src/main/java/error/ErrorManager.kt b/src/main/java/error/ErrorManager.kt
new file mode 100644
index 0000000..ea4f1b1
--- /dev/null
+++ b/src/main/java/error/ErrorManager.kt
@@ -0,0 +1,41 @@
+package error
+
+import environment.RuntimeEnvironment
+import error.Severity.CRITICAL
+import error.Severity.WARNING
+import java.io.PrintStream
+import java.text.MessageFormat.format
+
+/**
+ * Prints error messages and potentially terminates the application.
+ */
+class ErrorManager {
+
+    private val environment: RuntimeEnvironment = RuntimeEnvironment.getInstance()
+
+    fun handle(lispException: LispException) {
+        printMessage(lispException)
+
+        if (isCritical(lispException))
+            environment.terminateExceptionally()
+    }
+
+    private fun printMessage(lispException: LispException) {
+        val output = selectOutputStream(lispException.severity)
+        output.println(formatMessage(lispException))
+    }
+
+    private fun selectOutputStream(severity: Severity): PrintStream {
+        return if (severity === WARNING) environment.output else environment.errorOutput
+    }
+
+    private fun formatMessage(lispException: LispException): String {
+        val severity = lispException.severity
+        val prefix = severity.toDisplayString()
+        val message = format("[{0}] {1}", prefix, lispException.message)
+
+        return severity.decorate(message, environment)
+    }
+
+    private fun isCritical(lispException: LispException) = lispException.severity == CRITICAL
+}
diff --git a/src/main/java/error/LineColumnException.java b/src/main/java/error/LineColumnException.java
deleted file mode 100644
index f02779f..0000000
--- a/src/main/java/error/LineColumnException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package error;
-
-import file.FilePosition;
-
-import static java.text.MessageFormat.format;
-
-public abstract class LineColumnException extends LispException {
-
-    private static final long serialVersionUID = 1L;
-    private FilePosition position;
-
-    public LineColumnException(FilePosition position) {
-        this.position = position;
-    }
-
-    @Override
-    public String getMessage() {
-        return format("{0} - line {1}, column {2}",
-                      getMessagePrefix(),
-                      position.getLineNumber(),
-                      position.getColumnNumber());
-    }
-
-    public abstract String getMessagePrefix();
-}
\ No newline at end of file
diff --git a/src/main/java/error/LineColumnException.kt b/src/main/java/error/LineColumnException.kt
new file mode 100644
index 0000000..f2eb7e0
--- /dev/null
+++ b/src/main/java/error/LineColumnException.kt
@@ -0,0 +1,12 @@
+package error
+
+import file.FilePosition
+import java.text.MessageFormat.format
+
+abstract class LineColumnException(private val position: FilePosition) : LispException() {
+
+    abstract val messagePrefix: String
+
+    override val message: String
+        get() = format("{0} - line {1}, column {2}", messagePrefix, position.lineNumber, position.columnNumber)
+}
\ No newline at end of file
diff --git a/src/main/java/error/LispException.java b/src/main/java/error/LispException.java
deleted file mode 100644
index 22089af..0000000
--- a/src/main/java/error/LispException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package error;
-
-import error.ErrorManager.Severity;
-
-import static error.ErrorManager.Severity.ERROR;
-
-public abstract class LispException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public Severity getSeverity() {
-        return ERROR;
-    }
-}
diff --git a/src/main/java/error/LispException.kt b/src/main/java/error/LispException.kt
new file mode 100644
index 0000000..b5a6dec
--- /dev/null
+++ b/src/main/java/error/LispException.kt
@@ -0,0 +1,8 @@
+package error
+
+import error.Severity.ERROR
+
+abstract class LispException : RuntimeException() {
+
+    open val severity = ERROR
+}
diff --git a/src/main/java/error/LispWarning.java b/src/main/java/error/LispWarning.java
deleted file mode 100644
index a0799a0..0000000
--- a/src/main/java/error/LispWarning.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package error;
-
-import error.ErrorManager.Severity;
-
-import static error.ErrorManager.Severity.WARNING;
-
-public abstract class LispWarning extends LispException {
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public Severity getSeverity() {
-        return WARNING;
-    }
-}
diff --git a/src/main/java/error/LispWarning.kt b/src/main/java/error/LispWarning.kt
new file mode 100644
index 0000000..37abb6f
--- /dev/null
+++ b/src/main/java/error/LispWarning.kt
@@ -0,0 +1,8 @@
+package error
+
+import error.Severity.WARNING
+
+abstract class LispWarning : LispException() {
+
+    override val severity = WARNING
+}
diff --git a/src/main/java/error/Severity.kt b/src/main/java/error/Severity.kt
new file mode 100644
index 0000000..fe146ae
--- /dev/null
+++ b/src/main/java/error/Severity.kt
@@ -0,0 +1,31 @@
+package error
+
+import environment.RuntimeEnvironment
+
+enum class Severity {
+
+    WARNING {
+        override fun decorate(output: String, environment: RuntimeEnvironment): String =
+                environment.decorateWarningOutput(output)
+
+        override fun toDisplayString() = "warning"
+    },
+
+    ERROR {
+        override fun decorate(output: String, environment: RuntimeEnvironment): String =
+                environment.decorateErrorOutput(output)
+
+        override fun toDisplayString() = "error"
+    },
+
+    CRITICAL {
+        override fun decorate(output: String, environment: RuntimeEnvironment): String =
+                environment.decorateCriticalOutput(output)
+
+        override fun toDisplayString() = "critical"
+    };
+
+    abstract fun decorate(output: String, environment: RuntimeEnvironment): String
+
+    abstract fun toDisplayString(): String
+}
\ No newline at end of file
diff --git a/src/test/java/error/ErrorManagerTest.java b/src/test/java/error/ErrorManagerTest.java
index 2793f12..fbc0fd3 100644
--- a/src/test/java/error/ErrorManagerTest.java
+++ b/src/test/java/error/ErrorManagerTest.java
@@ -1,7 +1,6 @@
 package error;
 
 import environment.RuntimeEnvironment;
-import error.ErrorManager.Severity;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -11,9 +10,9 @@ import java.io.PrintStream;
 import java.util.HashSet;
 import java.util.Set;
 
-import static error.ErrorManager.Severity.CRITICAL;
-import static error.ErrorManager.Severity.ERROR;
-import static error.ErrorManager.Severity.WARNING;
+import static error.Severity.CRITICAL;
+import static error.Severity.ERROR;
+import static error.Severity.WARNING;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
diff --git a/src/test/java/function/ArgumentValidatorTest.java b/src/test/java/function/ArgumentValidatorTest.java
index d284caf..c3ded9d 100644
--- a/src/test/java/function/ArgumentValidatorTest.java
+++ b/src/test/java/function/ArgumentValidatorTest.java
@@ -12,7 +12,7 @@ import sexpression.Nil;
 import sexpression.SExpression;
 import sexpression.Symbol;
 
-import static error.ErrorManager.Severity.ERROR;
+import static error.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/function/UserDefinedFunctionTest.java b/src/test/java/function/UserDefinedFunctionTest.java
index 29cd20f..cb3334b 100644
--- a/src/test/java/function/UserDefinedFunctionTest.java
+++ b/src/test/java/function/UserDefinedFunctionTest.java
@@ -1,6 +1,6 @@
 package function;
 
-import error.ErrorManager;
+import error.Severity;
 import function.ArgumentValidator.TooFewArgumentsException;
 import function.ArgumentValidator.TooManyArgumentsException;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
@@ -74,6 +74,6 @@ public class UserDefinedFunctionTest {
 
         assertNotNull(e.getMessage());
         assertTrue(e.getMessage().length() > 0);
-        assertEquals(ErrorManager.Severity.ERROR, e.getSeverity());
+        assertEquals(Severity.ERROR, e.getSeverity());
     }
 }
diff --git a/src/test/java/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/java/function/builtin/SYMBOL_FUNCTIONTest.java
index 44d32dd..9aeb813 100644
--- a/src/test/java/function/builtin/SYMBOL_FUNCTIONTest.java
+++ b/src/test/java/function/builtin/SYMBOL_FUNCTIONTest.java
@@ -7,7 +7,7 @@ import function.builtin.SYMBOL_FUNCTION.UndefinedSymbolFunctionException;
 import org.junit.Test;
 import testutil.SymbolAndFunctionCleaner;
 
-import static error.ErrorManager.Severity.ERROR;
+import static error.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/interpreter/LispInterpreterTest.java b/src/test/java/interpreter/LispInterpreterTest.java
index 0619a27..659f096 100644
--- a/src/test/java/interpreter/LispInterpreterTest.java
+++ b/src/test/java/interpreter/LispInterpreterTest.java
@@ -11,7 +11,7 @@ import java.io.PrintStream;
 import java.util.HashSet;
 import java.util.Set;
 
-import static error.ErrorManager.Severity.CRITICAL;
+import static error.Severity.CRITICAL;
 import static interpreter.InteractiveLispInterpreter.PROMPT;
 import static java.text.MessageFormat.format;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/parser/LispParserTest.java b/src/test/java/parser/LispParserTest.java
index 13f15b0..af6b15a 100644
--- a/src/test/java/parser/LispParserTest.java
+++ b/src/test/java/parser/LispParserTest.java
@@ -10,7 +10,7 @@ import token.TokenFactory.BadCharacterException;
 
 import java.io.InputStream;
 
-import static error.ErrorManager.Severity.ERROR;
+import static error.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/scanner/LispCommentRemovingInputStreamTest.java b/src/test/java/scanner/LispCommentRemovingInputStreamTest.java
index ae986f4..abf3c05 100644
--- a/src/test/java/scanner/LispCommentRemovingInputStreamTest.java
+++ b/src/test/java/scanner/LispCommentRemovingInputStreamTest.java
@@ -6,7 +6,7 @@ import stream.UncheckedIOException;
 
 import java.io.InputStream;
 
-import static error.ErrorManager.Severity.CRITICAL;
+import static error.Severity.CRITICAL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/scanner/LispScannerTypeTest.java b/src/test/java/scanner/LispScannerTypeTest.java
index 7a5fe62..04f686b 100644
--- a/src/test/java/scanner/LispScannerTypeTest.java
+++ b/src/test/java/scanner/LispScannerTypeTest.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import static error.ErrorManager.Severity.ERROR;
+import static error.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/sexpression/SExpressionTest.java b/src/test/java/sexpression/SExpressionTest.java
index da9dfc8..ab8e99e 100644
--- a/src/test/java/sexpression/SExpressionTest.java
+++ b/src/test/java/sexpression/SExpressionTest.java
@@ -7,7 +7,7 @@ import sexpression.LispNumber.InvalidNumberException;
 import java.math.BigInteger;
 import java.util.Locale;
 
-import static error.ErrorManager.Severity.ERROR;
+import static error.Severity.ERROR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/table/FunctionTableTest.java b/src/test/java/table/FunctionTableTest.java
index a02facb..266166e 100644
--- a/src/test/java/table/FunctionTableTest.java
+++ b/src/test/java/table/FunctionTableTest.java
@@ -1,6 +1,6 @@
 package table;
 
-import error.ErrorManager;
+import error.Severity;
 import function.FunctionNames;
 import function.LispFunction;
 import org.junit.After;
@@ -146,7 +146,7 @@ public class FunctionTableTest {
 
         assertNotNull(e.getMessage());
         assertTrue(e.getMessage().length() > 0);
-        assertEquals(ErrorManager.Severity.CRITICAL, e.getSeverity());
+        assertEquals(Severity.CRITICAL, e.getSeverity());
     }
 
     @Test
diff --git a/src/test/java/testutil/TestUtilities.java b/src/test/java/testutil/TestUtilities.java
index c7a9edf..2f8c3db 100644
--- a/src/test/java/testutil/TestUtilities.java
+++ b/src/test/java/testutil/TestUtilities.java
@@ -11,7 +11,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Arrays;
 
-import static error.ErrorManager.Severity.ERROR;
+import static error.Severity.ERROR;
 import static function.builtin.EVAL.eval;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
diff --git a/src/test/java/token/TokenFactoryTest.java b/src/test/java/token/TokenFactoryTest.java
index e7a742f..2354909 100644
--- a/src/test/java/token/TokenFactoryTest.java
+++ b/src/test/java/token/TokenFactoryTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import token.TokenFactory.BadCharacterException;
 import token.TokenFactory.EmptyTokenTextException;
 
-import static error.ErrorManager.Severity.CRITICAL;
+import static error.Severity.CRITICAL;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;

From c04f4b6c51f27b74c900ea02f799c2aae4af9f0d Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sun, 18 Mar 2018 17:42:28 -0400
Subject: [PATCH 13/16] Convert some test classes to kotlin

---
 .idea/inspectionProfiles/Project_Default.xml |   6 +
 pom.xml                                      |  47 +++++-
 src/test/java/table/FunctionTableTest.java   | 162 -------------------
 src/test/java/table/FunctionTableTest.kt     | 141 ++++++++++++++++
 src/test/java/table/SymbolTableTest.java     |  63 --------
 src/test/java/table/SymbolTableTest.kt       |  63 ++++++++
 6 files changed, 253 insertions(+), 229 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 src/test/java/table/FunctionTableTest.java
 create mode 100644 src/test/java/table/FunctionTableTest.kt
 delete mode 100644 src/test/java/table/SymbolTableTest.java
 create mode 100644 src/test/java/table/SymbolTableTest.kt

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..2a51304
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="RemoveRedundantBackticks" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0e0b4d2..1e6b5d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,14 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <kotlin.version>1.2.30</kotlin.version>
+    <junit5.version>5.1.0</junit5.version>
+    <skipTests>false</skipTests>
   </properties>
 
   <build>
+    <!--<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>-->
+    <!--<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>-->
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -91,7 +96,27 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20.1</version>
+        <version>2.19.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>1.0.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit5.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit5.version}</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <skipTests>${skipTests}</skipTests>
+        </configuration>
       </plugin>
 
       <plugin>
@@ -145,9 +170,23 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test</artifactId>
-      <version>${kotlin.version}</version>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.9.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit5.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${junit5.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/table/FunctionTableTest.java b/src/test/java/table/FunctionTableTest.java
deleted file mode 100644
index 266166e..0000000
--- a/src/test/java/table/FunctionTableTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package table;
-
-import error.Severity;
-import function.FunctionNames;
-import function.LispFunction;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import sexpression.Cons;
-import sexpression.SExpression;
-import table.FunctionTable.LispFunctionInstantiationException;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-import static table.FunctionTable.defineFunction;
-import static table.FunctionTable.isAlreadyDefined;
-import static table.FunctionTable.lookupFunction;
-import static table.FunctionTable.resetFunctionTable;
-
-public class FunctionTableTest {
-
-    @FunctionNames({ "GOOD" })
-    public static class GoodFunction extends LispFunction {
-
-        public GoodFunction(String name) {}
-
-        @Override
-        public SExpression call(Cons argumentList) {
-            return NIL;
-        }
-    }
-
-    @FunctionNames({ "BAD" })
-    public static class BadFunction extends LispFunction {
-
-        @Override
-        public SExpression call(Cons argumentList) {
-            return NIL;
-        }
-    }
-
-    public static class UglyFunction extends LispFunction {
-
-        @Override
-        public SExpression call(Cons argumentList) {
-            return NIL;
-        }
-    }
-
-    private LispFunction createLispFunction() {
-        return new LispFunction() {
-
-            @Override
-            public SExpression call(Cons argumentList) {
-                return T;
-            }
-        };
-    }
-
-    @Before
-    public void setUp() {
-        resetFunctionTable();
-    }
-
-    @After
-    public void tearDown() {
-        resetFunctionTable();
-    }
-
-    @Test
-    public void builtInFunctionIsDefined() {
-        assertTrue(isAlreadyDefined("CONS"));
-    }
-
-    @Test
-    public void undefinedFunctionIsNotDefined() {
-        assertFalse(isAlreadyDefined("undefined"));
-    }
-
-    @Test
-    public void lookupBuiltInFunction_ReturnsFunction() {
-        assertNotNull(lookupFunction("CONS"));
-    }
-
-    @Test
-    public void lookupUndefinedFunction_ReturnsNull() {
-        assertNull(lookupFunction("undefined"));
-    }
-
-    @Test
-    public void defineFunctionWorks() {
-        String functionName = "testFunction";
-        LispFunction testFunction = createLispFunction();
-
-        assertNull(lookupFunction(functionName));
-        assertFalse(isAlreadyDefined(functionName));
-
-        defineFunction(functionName, testFunction);
-
-        assertTrue(isAlreadyDefined(functionName));
-        assertEquals(testFunction, lookupFunction(functionName));
-    }
-
-    @Test
-    public void resetFunctionTableWorks() {
-        String functionName = "testFunction";
-        LispFunction testFunction = createLispFunction();
-        defineFunction(functionName, testFunction);
-
-        resetFunctionTable();
-
-        assertFalse(isAlreadyDefined(functionName));
-        assertNull(lookupFunction(functionName));
-    }
-
-    @Test
-    public void resetWithCustomBuitIns() {
-        Set<Class<? extends LispFunction>> goodBuiltIns = new HashSet<>();
-        goodBuiltIns.add(GoodFunction.class);
-
-        resetFunctionTable(goodBuiltIns);
-
-        assertTrue(isAlreadyDefined("GOOD"));
-        assertNotNull(lookupFunction("GOOD"));
-    }
-
-    @Test(expected = LispFunctionInstantiationException.class)
-    public void unableToInitializeBuiltIn() {
-        Set<Class<? extends LispFunction>> badBuiltIns = new HashSet<>();
-        badBuiltIns.add(BadFunction.class);
-
-        resetFunctionTable(badBuiltIns);
-    }
-
-    @Test
-    public void lispFunctionInstantiationException_HasCorrectAttributes() {
-        LispFunctionInstantiationException e = new LispFunctionInstantiationException("Bad");
-
-        assertNotNull(e.getMessage());
-        assertTrue(e.getMessage().length() > 0);
-        assertEquals(Severity.CRITICAL, e.getSeverity());
-    }
-
-    @Test
-    public void namelessBuiltIn_DoesNotCauseNPE() {
-        Set<Class<? extends LispFunction>> namelessBuiltins = new HashSet<>();
-        namelessBuiltins.add(UglyFunction.class);
-
-        resetFunctionTable(namelessBuiltins);
-
-        assertFalse(isAlreadyDefined("UGLY"));
-        assertNull(lookupFunction("UGLY"));
-    }
-}
diff --git a/src/test/java/table/FunctionTableTest.kt b/src/test/java/table/FunctionTableTest.kt
new file mode 100644
index 0000000..5ef4c12
--- /dev/null
+++ b/src/test/java/table/FunctionTableTest.kt
@@ -0,0 +1,141 @@
+package table
+
+import error.Severity
+import function.FunctionNames
+import function.LispFunction
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
+import sexpression.Cons
+import sexpression.Nil
+import sexpression.Nil.NIL
+import sexpression.Symbol.T
+import table.FunctionTable.LispFunctionInstantiationException
+import table.FunctionTable.defineFunction
+import table.FunctionTable.isAlreadyDefined
+import table.FunctionTable.lookupFunction
+import table.FunctionTable.resetFunctionTable
+import java.util.HashSet
+
+@TestInstance(PER_CLASS)
+class FunctionTableTest {
+
+    @FunctionNames("GOOD")
+    class GoodFunction(name: String) : LispFunction() {
+
+        override fun call(argumentList: Cons): Nil = NIL
+    }
+
+    @FunctionNames("BAD")
+    class BadFunction : LispFunction() {
+
+        override fun call(argumentList: Cons): Nil = NIL
+    }
+
+    class UglyFunction : LispFunction() {
+
+        override fun call(argumentList: Cons): Nil = NIL
+    }
+
+    private fun createLispFunction() = object : LispFunction() {
+        override fun call(argumentList: Cons) = T
+    }
+
+    @BeforeEach
+    fun initialize() {
+        resetFunctionTable()
+    }
+
+    @AfterEach
+    fun tearDown() {
+        resetFunctionTable()
+    }
+
+    @Test
+    fun builtInFunctionIsDefined() {
+        assertThat(isAlreadyDefined("CONS")).isTrue()
+    }
+
+    @Test
+    fun undefinedFunctionIsNotDefined() {
+        assertThat(isAlreadyDefined("undefined")).isFalse()
+    }
+
+    @Test
+    fun lookupBuiltInFunction_ReturnsFunction() {
+        assertThat(lookupFunction("CONS")).isNotNull()
+    }
+
+    @Test
+    fun lookupUndefinedFunction_ReturnsNull() {
+        assertThat(lookupFunction("undefined")).isNull()
+    }
+
+    @Test
+    fun defineFunctionWorks() {
+        val functionName = "testFunction"
+        val testFunction = createLispFunction()
+
+        assertThat(lookupFunction(functionName)).isNull()
+        assertThat(isAlreadyDefined(functionName)).isFalse()
+
+        defineFunction(functionName, testFunction)
+
+        assertThat(isAlreadyDefined(functionName)).isTrue()
+        assertThat(lookupFunction(functionName)).isEqualTo(testFunction)
+    }
+
+    @Test
+    fun resetFunctionTableWorks() {
+        val functionName = "testFunction"
+        val testFunction = createLispFunction()
+        defineFunction(functionName, testFunction)
+
+        resetFunctionTable()
+
+        assertThat(lookupFunction(functionName)).isNull()
+        assertThat(isAlreadyDefined(functionName)).isFalse()
+    }
+
+    @Test
+    fun resetWithCustomBuitIns() {
+        val goodBuiltIns = HashSet<Class<out LispFunction>>()
+        goodBuiltIns.add(GoodFunction::class.java)
+
+        resetFunctionTable(goodBuiltIns)
+
+        assertThat(isAlreadyDefined("GOOD")).isTrue()
+        assertThat(lookupFunction("GOOD")).isNotNull()
+    }
+
+    @Test
+    fun unableToInitializeBuiltIn() {
+        val badBuiltIns = HashSet<Class<out LispFunction>>()
+        badBuiltIns.add(BadFunction::class.java)
+
+        assertThrows(LispFunctionInstantiationException::class.java) { resetFunctionTable(badBuiltIns) }
+    }
+
+    @Test
+    fun lispFunctionInstantiationException_HasCorrectAttributes() {
+        val e = LispFunctionInstantiationException("Bad")
+
+        assertThat(e.message).isNotEmpty()
+        assertThat(e.severity).isEqualTo(Severity.CRITICAL)
+    }
+
+    @Test
+    fun namelessBuiltIn_DoesNotCauseNPE() {
+        val namelessBuiltins = HashSet<Class<out LispFunction>>()
+        namelessBuiltins.add(UglyFunction::class.java)
+
+        resetFunctionTable(namelessBuiltins)
+
+        assertThat(isAlreadyDefined("UGLY")).isFalse()
+        assertThat(lookupFunction("UGLY")).isNull()
+    }
+}
diff --git a/src/test/java/table/SymbolTableTest.java b/src/test/java/table/SymbolTableTest.java
deleted file mode 100644
index 21da004..0000000
--- a/src/test/java/table/SymbolTableTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package table;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
-public class SymbolTableTest {
-
-    private SymbolTable symbolTable;
-
-    @Before
-    public void setUp() {
-        symbolTable = new SymbolTable();
-    }
-
-    @Test
-    public void lookupSymbolNotInTable() {
-        assertFalse(symbolTable.contains("symbol"));
-    }
-
-    @Test
-    public void lookupSymbolInTable() {
-        symbolTable.put("symbol", T);
-
-        assertTrue(symbolTable.contains("symbol"));
-    }
-
-    @Test
-    public void retrieveSymbolValue() {
-        symbolTable.put("symbol", T);
-
-        assertEquals(T, symbolTable.get("symbol"));
-    }
-
-    @Test
-    public void redefineSymbolValue() {
-        symbolTable.put("symbol", T);
-        symbolTable.put("symbol", NIL);
-
-        assertEquals(NIL, symbolTable.get("symbol"));
-    }
-
-    @Test
-    public void checkParentTableIsCorrect() {
-        SymbolTable childTable = new SymbolTable(symbolTable);
-
-        assertEquals(symbolTable, childTable.getParent());
-    }
-
-    @Test
-    public void lookupSymbolInParentTable() {
-        symbolTable.put("symbol", T);
-        SymbolTable childTable = new SymbolTable(symbolTable);
-        SymbolTable parentTable = childTable.getParent();
-
-        assertEquals(T, parentTable.get("symbol"));
-    }
-}
diff --git a/src/test/java/table/SymbolTableTest.kt b/src/test/java/table/SymbolTableTest.kt
new file mode 100644
index 0000000..334fb77
--- /dev/null
+++ b/src/test/java/table/SymbolTableTest.kt
@@ -0,0 +1,63 @@
+package table
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
+import sexpression.Nil.NIL
+import sexpression.Symbol.T
+
+@TestInstance(PER_CLASS)
+class SymbolTableTest {
+
+    private lateinit var symbolTable: SymbolTable
+
+    @BeforeEach
+    fun initialize() {
+        symbolTable = SymbolTable()
+    }
+
+    @Test
+    fun `lookup a symbol that does not exist`() {
+        assertThat(symbolTable.contains("symbol")).isFalse()
+    }
+
+    @Test
+    fun `lookup a symbol that exists`() {
+        symbolTable.put("symbol", T)
+
+        assertThat(symbolTable.contains("symbol")).isTrue()
+    }
+
+    @Test
+    fun `get the value of a symbol`() {
+        symbolTable.put("symbol", T)
+
+        assertThat(symbolTable.get("symbol")).isEqualTo(T)
+    }
+
+    @Test
+    fun `redefine the value of a symbol`() {
+        symbolTable.put("symbol", T)
+        symbolTable.put("symbol", NIL)
+
+        assertThat(symbolTable.get("symbol")).isEqualTo(NIL)
+    }
+
+    @Test
+    fun `check the value of a parent table`() {
+        val childTable = SymbolTable(symbolTable)
+
+        assertThat(childTable.parent).isEqualTo(symbolTable)
+    }
+
+    @Test
+    fun `lookup a symbol in a parent table`() {
+        symbolTable.put("symbol", T)
+        val childTable = SymbolTable(symbolTable)
+        val parentTable = childTable.parent
+
+        assertThat(parentTable.get("symbol")).isEqualTo(T)
+    }
+}

From b5d817a8ac9c5cfba15491d0165f04d616d77bc3 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sun, 18 Mar 2018 17:57:09 -0400
Subject: [PATCH 14/16] Add conversion comments to pom

---
 .idea/codeStyles/Project.xml             | 1 -
 pom.xml                                  | 6 ++++++
 src/test/java/table/FunctionTableTest.kt | 3 ---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2293d97..6caeb2f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -77,7 +77,6 @@
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
-      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
       <option name="CALL_PARAMETERS_WRAP" value="5" />
diff --git a/pom.xml b/pom.xml
index 1e6b5d8..dbab89a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
   </properties>
 
   <build>
+    <!-- TODO - when everything is converted to kotlin -->
     <!--<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>-->
     <!--<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>-->
 
@@ -57,6 +58,7 @@
         </configuration>
       </plugin>
 
+      <!-- TODO - remove when everything is converted to kotlin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -108,6 +110,8 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit5.version}</version>
           </dependency>
+
+          <!-- TODO - remove when all test cases converted to junit 5 -->
           <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
@@ -190,6 +194,7 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- TODO - remove when test cases all converted to junit 5 and assertj-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -197,6 +202,7 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- TODO - remove when test cases all converted to junit 5 and assertj-->
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
diff --git a/src/test/java/table/FunctionTableTest.kt b/src/test/java/table/FunctionTableTest.kt
index 5ef4c12..a2aa680 100644
--- a/src/test/java/table/FunctionTableTest.kt
+++ b/src/test/java/table/FunctionTableTest.kt
@@ -26,18 +26,15 @@ class FunctionTableTest {
 
     @FunctionNames("GOOD")
     class GoodFunction(name: String) : LispFunction() {
-
         override fun call(argumentList: Cons): Nil = NIL
     }
 
     @FunctionNames("BAD")
     class BadFunction : LispFunction() {
-
         override fun call(argumentList: Cons): Nil = NIL
     }
 
     class UglyFunction : LispFunction() {
-
         override fun call(argumentList: Cons): Nil = NIL
     }
 

From 426b130e3b0e103cc2a61486c1f294addc96b1aa Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Mon, 19 Mar 2018 08:13:40 -0400
Subject: [PATCH 15/16] Update code formatting rules

---
 .idea/codeStyles/Project.xml                     | 3 ++-
 .idea/kotlinc.xml                                | 7 +++++++
 src/main/java/error/Severity.kt                  | 6 +++---
 src/main/java/function/builtin/special/LAMBDA.kt | 1 -
 src/main/java/terminal/LispTerminal.java         | 3 +--
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6caeb2f..d619137 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -31,6 +31,8 @@
       <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </JetCodeStyleSettings>
     <XML>
+      <option name="XML_ATTRIBUTE_WRAP" value="4" />
+      <option name="XML_KEEP_BLANK_LINES" value="1" />
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
     <codeStyleSettings language="JAVA">
@@ -39,7 +41,6 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..5806fb3
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/error/Severity.kt b/src/main/java/error/Severity.kt
index fe146ae..3fd2cce 100644
--- a/src/main/java/error/Severity.kt
+++ b/src/main/java/error/Severity.kt
@@ -6,21 +6,21 @@ enum class Severity {
 
     WARNING {
         override fun decorate(output: String, environment: RuntimeEnvironment): String =
-                environment.decorateWarningOutput(output)
+            environment.decorateWarningOutput(output)
 
         override fun toDisplayString() = "warning"
     },
 
     ERROR {
         override fun decorate(output: String, environment: RuntimeEnvironment): String =
-                environment.decorateErrorOutput(output)
+            environment.decorateErrorOutput(output)
 
         override fun toDisplayString() = "error"
     },
 
     CRITICAL {
         override fun decorate(output: String, environment: RuntimeEnvironment): String =
-                environment.decorateCriticalOutput(output)
+            environment.decorateCriticalOutput(output)
 
         override fun toDisplayString() = "critical"
     };
diff --git a/src/main/java/function/builtin/special/LAMBDA.kt b/src/main/java/function/builtin/special/LAMBDA.kt
index 262e995..580f5d4 100644
--- a/src/main/java/function/builtin/special/LAMBDA.kt
+++ b/src/main/java/function/builtin/special/LAMBDA.kt
@@ -13,7 +13,6 @@ import sexpression.Symbol
 @FunctionNames("LAMBDA", "Λ")
 class LAMBDA(name: String) : LispSpecialFunction() {
 
-
     private val argumentValidator: ArgumentValidator = ArgumentValidator(name)
     private val lambdaListValidator: ArgumentValidator = ArgumentValidator("$name|lambda-list|")
 
diff --git a/src/main/java/terminal/LispTerminal.java b/src/main/java/terminal/LispTerminal.java
index 77e24e8..99dee32 100644
--- a/src/main/java/terminal/LispTerminal.java
+++ b/src/main/java/terminal/LispTerminal.java
@@ -209,8 +209,7 @@ public class LispTerminal {
             TerminalPosition cursorPosition = terminal.getCursorPosition();
             terminal.putCharacter(character);
             moveCursorToNextRow(cursorPosition);
-        }
-        else
+        } else
             terminal.putCharacter(character);
     }
 

From d172c62e01ff4f298e7f6739e0307353af7aabfe Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Mon, 19 Mar 2018 20:16:20 -0400
Subject: [PATCH 16/16] Convert table tests to kotlin

---
 src/test/java/table/ExecutionContextTest.java | 102 ------------------
 src/test/java/table/ExecutionContextTest.kt   |  97 +++++++++++++++++
 src/test/java/table/FunctionTableTest.kt      |  22 ++--
 src/test/java/table/SymbolTableTest.kt        |   2 +-
 4 files changed, 109 insertions(+), 114 deletions(-)
 delete mode 100644 src/test/java/table/ExecutionContextTest.java
 create mode 100644 src/test/java/table/ExecutionContextTest.kt

diff --git a/src/test/java/table/ExecutionContextTest.java b/src/test/java/table/ExecutionContextTest.java
deleted file mode 100644
index ec950b4..0000000
--- a/src/test/java/table/ExecutionContextTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package table;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static sexpression.Nil.NIL;
-import static sexpression.Symbol.T;
-
-public class ExecutionContextTest {
-
-    private ExecutionContext executionContext;
-
-    public ExecutionContextTest() {
-        this.executionContext = ExecutionContext.getInstance();
-    }
-
-    @Before
-    public void setUp() {
-        executionContext.clearContext();
-    }
-
-    @After
-    public void tearDown() {
-        executionContext.clearContext();
-    }
-
-    @Test
-    public void assignANewScope() {
-        SymbolTable scope = new SymbolTable();
-        executionContext.setScope(scope);
-
-        assertThat(executionContext.getScope(), is(scope));
-    }
-
-    @Test
-    public void clearContext() {
-        SymbolTable scope = new SymbolTable();
-        executionContext.setScope(scope);
-
-        assertThat(executionContext.getScope(), is(scope));
-        executionContext.clearContext();
-        assertThat(executionContext.getScope(), is(not(scope)));
-        assertThat(executionContext.getScope().getParent(), is(nullValue()));
-    }
-
-    @Test
-    public void lookupVariable() {
-        executionContext.getScope().put("test", T);
-
-        assertThat(executionContext.lookupSymbolValue("test"), is(T));
-    }
-
-    @Test
-    public void lookupLocalVariable() {
-        SymbolTable scope = new SymbolTable(executionContext.getScope());
-
-        scope.put("local", T);
-        executionContext.setScope(scope);
-
-        assertThat(executionContext.lookupSymbolValue("local"), is(T));
-    }
-
-    @Test
-    public void lookupGlobalVariable() {
-        SymbolTable scope = new SymbolTable(executionContext.getScope());
-
-        executionContext.getScope().put("global", T);
-        executionContext.setScope(scope);
-
-        assertThat(executionContext.lookupSymbolValue("global"), is(T));
-    }
-
-    @Test
-    public void lookupShadowedVariable() {
-        SymbolTable scope = new SymbolTable(executionContext.getScope());
-
-        scope.put("shadowed", NIL);
-        executionContext.getScope().put("shadowed", T);
-        executionContext.setScope(scope);
-
-        assertThat(executionContext.lookupSymbolValue("shadowed"), is(NIL));
-    }
-
-    @Test
-    public void restoreGlobalContext() {
-        SymbolTable global = executionContext.getScope();
-        SymbolTable scope1 = new SymbolTable(global);
-        SymbolTable scope2 = new SymbolTable(scope1);
-        SymbolTable scope3 = new SymbolTable(scope2);
-        executionContext.setScope(scope3);
-
-        assertThat(executionContext.getScope().isGlobal(), is(false));
-        executionContext.restoreGlobalScope();
-        assertThat(executionContext.getScope().isGlobal(), is(true));
-        assertThat(executionContext.getScope(), is(global));
-    }
-}
diff --git a/src/test/java/table/ExecutionContextTest.kt b/src/test/java/table/ExecutionContextTest.kt
new file mode 100644
index 0000000..ea99313
--- /dev/null
+++ b/src/test/java/table/ExecutionContextTest.kt
@@ -0,0 +1,97 @@
+package table
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
+import sexpression.Nil.NIL
+import sexpression.Symbol.T
+
+@TestInstance(PER_CLASS)
+class ExecutionContextTest {
+
+    private val executionContext: ExecutionContext = ExecutionContext.getInstance()
+
+    @BeforeEach
+    fun setUp() {
+        executionContext.clearContext()
+    }
+
+    @AfterEach
+    fun tearDown() {
+        executionContext.clearContext()
+    }
+
+    @Test
+    fun `assign a new scope`() {
+        val scope = SymbolTable()
+        executionContext.scope = scope
+
+        assertThat(executionContext.scope).isEqualTo(scope)
+    }
+
+    @Test
+    fun `clear the context`() {
+        val scope = SymbolTable()
+        executionContext.scope = scope
+
+        assertThat(executionContext.scope).isEqualTo(scope)
+        executionContext.clearContext()
+        assertThat(executionContext.scope).isNotEqualTo(scope)
+        assertThat(executionContext.scope.parent).isNull()
+    }
+
+    @Test
+    fun `lookup a variable`() {
+        executionContext.scope.put("test", T)
+
+        assertThat(executionContext.lookupSymbolValue("test")).isEqualTo(T)
+    }
+
+    @Test
+    fun `lookup a local variable`() {
+        val scope = SymbolTable(executionContext.scope)
+
+        scope.put("local", T)
+        executionContext.scope = scope
+
+        assertThat(executionContext.lookupSymbolValue("local")).isEqualTo(T)
+    }
+
+    @Test
+    fun `lookup a global variable`() {
+        val scope = SymbolTable(executionContext.scope)
+
+        executionContext.scope.put("global", T)
+        executionContext.scope = scope
+
+        assertThat(executionContext.lookupSymbolValue("global")).isEqualTo(T)
+    }
+
+    @Test
+    fun `lookup a shadowed variable`() {
+        val scope = SymbolTable(executionContext.scope)
+
+        scope.put("shadowed", NIL)
+        executionContext.scope.put("shadowed", T)
+        executionContext.scope = scope
+
+        assertThat(executionContext.lookupSymbolValue("shadowed")).isEqualTo(NIL)
+    }
+
+    @Test
+    fun `restore the global context`() {
+        val global = executionContext.scope
+        val scope1 = SymbolTable(global)
+        val scope2 = SymbolTable(scope1)
+        val scope3 = SymbolTable(scope2)
+        executionContext.scope = scope3
+
+        assertThat(executionContext.scope.isGlobal).isFalse()
+        executionContext.restoreGlobalScope()
+        assertThat(executionContext.scope.isGlobal).isTrue()
+        assertThat(executionContext.scope).isEqualTo(global)
+    }
+}
diff --git a/src/test/java/table/FunctionTableTest.kt b/src/test/java/table/FunctionTableTest.kt
index a2aa680..27ec5dd 100644
--- a/src/test/java/table/FunctionTableTest.kt
+++ b/src/test/java/table/FunctionTableTest.kt
@@ -43,7 +43,7 @@ class FunctionTableTest {
     }
 
     @BeforeEach
-    fun initialize() {
+    fun setUp() {
         resetFunctionTable()
     }
 
@@ -53,27 +53,27 @@ class FunctionTableTest {
     }
 
     @Test
-    fun builtInFunctionIsDefined() {
+    fun `built-in function is defined`() {
         assertThat(isAlreadyDefined("CONS")).isTrue()
     }
 
     @Test
-    fun undefinedFunctionIsNotDefined() {
+    fun `undefined function is not defined`() {
         assertThat(isAlreadyDefined("undefined")).isFalse()
     }
 
     @Test
-    fun lookupBuiltInFunction_ReturnsFunction() {
+    fun `lookup a built-in function`() {
         assertThat(lookupFunction("CONS")).isNotNull()
     }
 
     @Test
-    fun lookupUndefinedFunction_ReturnsNull() {
+    fun `look up an undefined function`() {
         assertThat(lookupFunction("undefined")).isNull()
     }
 
     @Test
-    fun defineFunctionWorks() {
+    fun `function is defined`() {
         val functionName = "testFunction"
         val testFunction = createLispFunction()
 
@@ -87,7 +87,7 @@ class FunctionTableTest {
     }
 
     @Test
-    fun resetFunctionTableWorks() {
+    fun `function table is reset`() {
         val functionName = "testFunction"
         val testFunction = createLispFunction()
         defineFunction(functionName, testFunction)
@@ -99,7 +99,7 @@ class FunctionTableTest {
     }
 
     @Test
-    fun resetWithCustomBuitIns() {
+    fun `reset function table with custom built-ins`() {
         val goodBuiltIns = HashSet<Class<out LispFunction>>()
         goodBuiltIns.add(GoodFunction::class.java)
 
@@ -110,7 +110,7 @@ class FunctionTableTest {
     }
 
     @Test
-    fun unableToInitializeBuiltIn() {
+    fun `unable to initialize a built-in function`() {
         val badBuiltIns = HashSet<Class<out LispFunction>>()
         badBuiltIns.add(BadFunction::class.java)
 
@@ -118,7 +118,7 @@ class FunctionTableTest {
     }
 
     @Test
-    fun lispFunctionInstantiationException_HasCorrectAttributes() {
+    fun `lispFunctionInstantiationException is cool`() {
         val e = LispFunctionInstantiationException("Bad")
 
         assertThat(e.message).isNotEmpty()
@@ -126,7 +126,7 @@ class FunctionTableTest {
     }
 
     @Test
-    fun namelessBuiltIn_DoesNotCauseNPE() {
+    fun `built-in without a name doesn't throw an exception`() {
         val namelessBuiltins = HashSet<Class<out LispFunction>>()
         namelessBuiltins.add(UglyFunction::class.java)
 
diff --git a/src/test/java/table/SymbolTableTest.kt b/src/test/java/table/SymbolTableTest.kt
index 334fb77..8af0072 100644
--- a/src/test/java/table/SymbolTableTest.kt
+++ b/src/test/java/table/SymbolTableTest.kt
@@ -14,7 +14,7 @@ class SymbolTableTest {
     private lateinit var symbolTable: SymbolTable
 
     @BeforeEach
-    fun initialize() {
+    fun setUp() {
         symbolTable = SymbolTable()
     }