diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..7ddfc9e 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c3f0e24..b65bd4c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="ALL" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="fa39dde5-8982-452b-95c3-23d6201b91a8" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/controller/GraphicsController.class" afterPath="$PROJECT_DIR$/target/classes/controller/GraphicsController.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/controller/GraphicsTree.class" afterPath="$PROJECT_DIR$/target/classes/controller/GraphicsTree.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/shape/Circle.class" afterPath="$PROJECT_DIR$/target/classes/shape/Circle.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/shape/Line.class" afterPath="$PROJECT_DIR$/target/classes/shape/Line.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/tree/BinarySearchTree.class" afterPath="$PROJECT_DIR$/target/classes/tree/BinarySearchTree.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/controller/GraphicsController.java" afterPath="$PROJECT_DIR$/src/main/java/controller/GraphicsController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/controller/GraphicsTree.java" afterPath="$PROJECT_DIR$/src/main/java/controller/GraphicsTree.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/shape/Circle.java" afterPath="$PROJECT_DIR$/src/main/java/shape/Circle.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/shape/Line.java" afterPath="$PROJECT_DIR$/src/main/java/shape/Line.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tree/BinarySearchTree.java" afterPath="$PROJECT_DIR$/src/main/java/tree/BinarySearchTree.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/controller/GraphicsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/controller/GraphicsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/controller/GraphicsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/controller/GraphicsTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/shape/Circle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/shape/Circle.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/shape/Line.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/shape/Line.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/tree/BinarySearchTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tree/BinarySearchTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/controller/GraphicsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/controller/GraphicsController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/controller/GraphicsTree.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/controller/GraphicsTree.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/shape/Circle.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/shape/Circle.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/shape/Line.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/shape/Line.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/tree/BinarySearchTree.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/tree/BinarySearchTree.class" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/out/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
@@ -163,12 +161,8 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="MavenImportPreferences">
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
@@ -184,11 +178,18 @@
       </PATH>
     </treeState>
   </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 7
+}</component>
   <component name="ProjectFrameBounds">
     <option name="x" value="82" />
     <option name="width" value="1838" />
     <option name="height" value="1080" />
   </component>
+  <component name="ProjectId" id="2ZaE1XBZRalhhvj7mzA1yyQPSME" />
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
@@ -329,14 +330,37 @@
       <pane id="PackagesPane" />
     </panes>
   </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="project.structure.last.edited" value="SDKs" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
+    <option name="showVisibilityIcons" value="true" />
   </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Application.com.ericcanull.fxbinarytree.app.Main.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "master",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/Users/aslam/Documents/GitHub/fxbinarytree-fork",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
+    "vue.rearranger.settings.migration": "true"
+  },
+  "keyToStringList": {
+    "GitStage.ChangesTree.GroupingKeys": [
+      "directory",
+      "module",
+      "repository"
+    ]
+  }
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/image" />
@@ -345,41 +369,7 @@
       <recent name="$PROJECT_DIR$/src/main/java" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected="Application.Main">
-    <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" value="app.Main" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="fxbinarytree" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file id="idea.log" enabled="true" />
-      <method />
-    </configuration>
+  <component name="RunManager">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
       <module name="" />
       <option name="DEPLOY" value="true" />
@@ -443,21 +433,6 @@
       <module />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -520,25 +495,6 @@
     <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
       <method />
     </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
       <option name="BCName" value="" />
       <option name="IOSSimulatorSdkPath" value="" />
@@ -588,22 +544,6 @@
       <option name="trusted" value="true" />
       <method />
     </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
     <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
       <setting name="vmparams" value="" />
       <setting name="cmdLine" value="run-app" />
@@ -613,168 +553,85 @@
       <setting name="depsClasspath" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
+      <predefined_log_file id="idea.log" enabled="true" />
       <method />
     </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
-      <node-interpreter value="project" />
-      <working-dir value="" />
-      <envs />
-      <scope-kind value="ALL" />
+    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
       <method />
     </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
+    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
       <method />
     </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
+    <configuration name="com.ericcanull.fxbinarytree.app.Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.ericcanull.fxbinarytree.app.Main" />
       <module name="fxbinarytree" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.ericcanull.fxbinarytree.app.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
+    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <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="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
+    <configuration default="true" type="TestNG">
       <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
       <properties />
       <listeners />
-      <method />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+    <configuration default="true" type="js.build_tools.gulp">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <gulpfile />
       <tasks />
       <arguments />
       <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
+      <method v="2" />
     </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Application.Main" />
-    </list>
     <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Application.Main" />
+      <list>
+        <item itemvalue="Application.com.ericcanull.fxbinarytree.app.Main" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="jdk-21.0.1-openjdk-21.0.1-8336523bb0d9-55c9c8bc" />
+      </set>
+    </attachedChunks>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="fa39dde5-8982-452b-95c3-23d6201b91a8" name="Default" comment="" />
       <created>1499366758985</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
@@ -789,7 +646,18 @@
       <workItem from="1499898183017" duration="640000" />
       <workItem from="1500012397864" duration="603000" />
       <workItem from="1500360399244" duration="8000" />
+      <workItem from="1702651575682" duration="50000" />
+      <workItem from="1702651639246" duration="1940000" />
+    </task>
+    <task id="LOCAL-00001" summary="Update project settings and configs&#10;&#10;This commit includes a significant update and cleanup of project settings stored in .idea and workspace.xml files. Additionally, Maven wrapper scripts were added to support the build process. A related project configuration file (.iml) was removed.">
+      <option name="closed" value="true" />
+      <created>1702653207767</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1702653207767</updated>
     </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -832,10 +700,11 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="processedProjectFiles" value="true" />
+    <option name="version" value="3" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Update project settings and configs&#10;&#10;This commit includes a significant update and cleanup of project settings stored in .idea and workspace.xml files. Additionally, Maven wrapper scripts were added to support the build process. A related project configuration file (.iml) was removed." />
+    <option name="LAST_COMMIT_MESSAGE" value="Update project settings and configs&#10;&#10;This commit includes a significant update and cleanup of project settings stored in .idea and workspace.xml files. Additionally, Maven wrapper scripts were added to support the build process. A related project configuration file (.iml) was removed." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -843,12 +712,9 @@
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/tree/BinaryTreeBasis.java</url>
           <line>19</line>
-          <properties />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="1" />
     </breakpoint-manager>
-    <watches-manager />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
diff --git a/fxbinarytree.iml b/fxbinarytree.iml
deleted file mode 100644
index c035f0b..0000000
--- a/fxbinarytree.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..8a8fb22
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..1d8ab01
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/pom.xml b/pom.xml
index 3bd496e..09f1446 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>fxbinarytree</groupId>
+    <groupId>com.ericcanull</groupId>
     <artifactId>fxbinarytree</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <name>fxbinarytree</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.version>5.10.0</junit.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>21.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <version>21.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>21.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <executions>
+                    <execution>
+                        <!-- Default configuration for running with: mvn clean javafx:run -->
+                        <id>default-cli</id>
+                        <configuration>
+                            <mainClass>com.ericcanull.fxbinarytree/com.ericcanull.fxbinarytree.app.Main
+                            </mainClass>
+                            <launcher>app</launcher>
+                            <jlinkZipName>app</jlinkZipName>
+                            <jlinkImageName>app</jlinkImageName>
+                            <noManPages>true</noManPages>
+                            <stripDebug>true</stripDebug>
+                            <noHeaderFiles>true</noHeaderFiles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-
-
 </project>
\ No newline at end of file
diff --git a/src/main/java/app/Main.java b/src/main/java/com/ericcanull/fxbinarytree/app/Main.java
similarity index 67%
rename from src/main/java/app/Main.java
rename to src/main/java/com/ericcanull/fxbinarytree/app/Main.java
index e0c9496..fea65ed 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/app/Main.java
@@ -1,35 +1,36 @@
-package app;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-/**
- * Demonstrates a Binary Search Tree using javafx components.
- * @author Eric Canull
- * @version 1.0
- */
-public class Main extends Application {
-
-	/**
-	 * Builds the Graphic UI.
-	 */
-	@Override
-	public void start(Stage stage) throws Exception {
-		Parent root = FXMLLoader.load(getClass().getResource("/fxml/FXMLGraphicsPanel.fxml"));
-
-		Scene scene = new Scene(root);
-
-		stage.setScene(scene);
-		stage.show();
-	}
-
-	/**
-	 * @param args the command line arguments
-	 */
-	public static void main(String... args) {
-		launch(args);
-	}
-}
+package com.ericcanull.fxbinarytree.app;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.util.Objects;
+
+/**
+ * Demonstrates a Binary Search Tree using javafx components.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public class Main extends Application {
+	/**
+	 * Builds the Graphic UI.
+	 */
+	@Override
+	public void start(Stage stage) throws Exception {
+		Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource( "/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml")));
+
+		Scene scene = new Scene(root);
+
+		stage.setScene(scene);
+		stage.show();
+	}
+
+	/**
+	 * @param args the command line arguments
+	 */
+	public static void main( String[] args ) {
+		launch();
+	}
+}
diff --git a/src/main/java/controller/GraphicsController.java b/src/main/java/com/ericcanull/fxbinarytree/controller/GraphicsController.java
similarity index 84%
rename from src/main/java/controller/GraphicsController.java
rename to src/main/java/com/ericcanull/fxbinarytree/controller/GraphicsController.java
index 2eb1375..6c06d63 100644
--- a/src/main/java/controller/GraphicsController.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/controller/GraphicsController.java
@@ -1,129 +1,131 @@
-package controller;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.*;
-import javafx.scene.layout.BorderPane;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Constructs the GUI components and performs events for displaying and
- * manipulating the binary tree.
- * @author Eric Canull
- * @version 1.0
- */
-public final class GraphicsController implements Initializable {
-
-	// Panels and other GUI components
-	@FXML private BorderPane root_container;
-	@FXML private TextArea traversal_textarea;
-	@FXML private TextField input_field;
-
-	private GraphicsTree graphicsTree;
-
-	/**
-	 * Constructs the GUI components and performs events for displaying and
-	 * changing the data in the binary tree.
-	 */
-	@Override
-	public void initialize(URL location, ResourceBundle resources) {
-
-		// The center panel for drawing the tree
-		graphicsTree = new GraphicsTree();
-		// Add the panels onto the border pane
-		root_container.setCenter(graphicsTree);
-
-		// Bind canvas size to stack pane size.
-		graphicsTree.widthProperty().bind(root_container.widthProperty());
-		graphicsTree.heightProperty().bind(root_container.heightProperty().subtract(50));
-	}
-	
-	/**
-	 *  Performs the action when the search button is clicked.
-	 */
-	@FXML private void searchOnAction(ActionEvent event) {
-		try {
-			graphicsTree.search(Integer.parseInt(input_field.getText().trim()));
-		} catch (NumberFormatException nfe) {
-			Alert alert = new Alert(Alert.AlertType.ERROR,
-					"Error searching for value. The input field can only accept numbers.", 	ButtonType.OK);
-
-			alert.showAndWait()
-					.filter(response -> response == ButtonType.OK)
-					.ifPresent(response -> alert.close());
-
-		}
-	}
-
-	/**
-	 * Performs the action when the delete button is clicked.
-	 */
-	@FXML private void deleteOnAction(ActionEvent event) {
-		try {
-			graphicsTree.delete(Integer.parseInt(input_field.getText().trim()));
-		} catch (NumberFormatException nfe) {
-			Alert alert = new Alert(Alert.AlertType.ERROR, "Error deleting value. The input field can only accept numbers.",
-					ButtonType.OK);
-			alert.showAndWait()
-					.filter(response -> response == ButtonType.OK)
-					.ifPresent(response -> alert.close());
-		}
-	}
-
-	private void clearTree() {
-		graphicsTree.makeEmpty();
-		traversal_textarea.setText("");
-	}
-	/**
-	 * Performs the action when the clear button is clicked.
-	 */
-	@FXML private void clearOnAction(ActionEvent event) {
-		Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "Do you want to empty the tree?", ButtonType.OK);
-		alert.showAndWait()
-				.filter(response -> response == ButtonType.OK)
-				.ifPresent(response -> clearTree());
-
-	}
-
-	/**
-	 *  Performs the action when the insert button is clicked.
-	 */
-	@FXML private void insertOnAction(ActionEvent event) {
-		try {
-			graphicsTree.insert(Integer.parseInt(input_field.getText().trim()));
-		} catch (NumberFormatException nfe) {
-			Alert alert = new Alert(Alert.AlertType.ERROR, "Error inserting value. The input field can only accept numbers.",
-					ButtonType.OK);
-			alert.showAndWait()
-					.filter(response -> response == ButtonType.OK)
-					.ifPresent(response -> alert.close());
-		}
-	}
-
-	/**
-	 * Performs the action when the first traversal button is clicked.
-	 */
-	@FXML private void inorderOnAction(ActionEvent event) {
-		graphicsTree.setInorder();
-		traversal_textarea.setText(graphicsTree.printTree());
-	}
-
-	/**
-	 *  Performs the action when the second traversal button is clicked.
-	 */
-	@FXML private void preorderOnAction(ActionEvent event) {
-		graphicsTree.setPreorder();
-		traversal_textarea.setText(graphicsTree.printTree());
-	}
-
-	/**
-	 *  Performs the action when the third traversal button is clicked.
-	 */
-	@FXML private void postorderOnAction(ActionEvent event) {
-		graphicsTree.setPostorder();
-		traversal_textarea.setText(graphicsTree.printTree());
-	}
-}
+package com.ericcanull.fxbinarytree.controller;
+
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.BorderPane;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+/**
+ * Constructs the GUI components and performs events for displaying and
+ * manipulating the binary tree.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public final class GraphicsController implements Initializable {
+
+	// Panels and other GUI components
+	@FXML private BorderPane root_container;
+	@FXML private TextArea traversal_textarea;
+	@FXML private TextField input_field;
+
+	private GraphicsTree graphicsTree;
+
+	/**
+	 * Constructs the GUI components and performs events for displaying and
+	 * changing the data in the binary tree.
+	 */
+	@Override
+	public void initialize(URL location, ResourceBundle resources) {
+
+		// The center panel for drawing the tree
+		graphicsTree = new GraphicsTree();
+		// Add the panels onto the border pane
+		root_container.setCenter(graphicsTree);
+
+		// Bind canvas size to stack pane size.
+		graphicsTree.widthProperty().bind(root_container.widthProperty());
+		graphicsTree.heightProperty().bind(root_container.heightProperty().subtract(50));
+	}
+	
+	/**
+	 *  Performs the action when the search button is clicked.
+	 */
+	@FXML private void searchOnAction( ) {
+		try {
+			graphicsTree.search(Integer.parseInt(input_field.getText().trim()));
+		} catch (NumberFormatException nfe) {
+			Alert alert = new Alert(Alert.AlertType.ERROR,
+					"Error searching for value. The input field can only accept numbers.", 	ButtonType.OK);
+
+			alert.showAndWait()
+					.filter(response -> response == ButtonType.OK)
+					.ifPresent(response -> alert.close());
+
+		}
+	}
+
+	/**
+	 * Performs the action when the delete button is clicked.
+	 */
+	@FXML private void deleteOnAction( ) {
+		try {
+			graphicsTree.delete(Integer.parseInt(input_field.getText().trim()));
+		} catch (NumberFormatException nfe) {
+			Alert alert = new Alert(Alert.AlertType.ERROR, "Error deleting value. The input field can only accept numbers.",
+					ButtonType.OK);
+			alert.showAndWait()
+					.filter(response -> response == ButtonType.OK)
+					.ifPresent(response -> alert.close());
+		}
+	}
+
+	private void clearTree() {
+		graphicsTree.makeEmpty();
+		traversal_textarea.setText("");
+	}
+	/**
+	 * Performs the action when the clear button is clicked.
+	 */
+	@FXML private void clearOnAction( ) {
+		Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "Do you want to empty the tree?", ButtonType.OK);
+		alert.showAndWait()
+				.filter(response -> response == ButtonType.OK)
+				.ifPresent(response -> clearTree());
+
+	}
+
+	/**
+	 *  Performs the action when the insert button is clicked.
+	 */
+	@FXML private void insertOnAction( ) {
+		try {
+			graphicsTree.insert(Integer.parseInt(input_field.getText().trim()));
+		} catch (NumberFormatException nfe) {
+			Alert alert = new Alert(Alert.AlertType.ERROR, "Error inserting value. The input field can only accept numbers.",
+					ButtonType.OK);
+			alert.showAndWait()
+					.filter(response -> response == ButtonType.OK)
+					.ifPresent(response -> alert.close());
+		}
+	}
+
+	/**
+	 * Performs the action when the first traversal button is clicked.
+	 */
+	@FXML private void inorderOnAction( ) {
+		graphicsTree.setInorder();
+		traversal_textarea.setText(graphicsTree.printTree());
+	}
+
+	/**
+	 *  Performs the action when the second traversal button is clicked.
+	 */
+	@FXML private void preorderOnAction( ) {
+		graphicsTree.setPreorder();
+		traversal_textarea.setText(graphicsTree.printTree());
+	}
+
+	/**
+	 *  Performs the action when the third traversal button is clicked.
+	 */
+	@FXML private void postorderOnAction( ) {
+		graphicsTree.setPostorder();
+		traversal_textarea.setText(graphicsTree.printTree());
+	}
+}
diff --git a/src/main/java/controller/GraphicsTree.java b/src/main/java/com/ericcanull/fxbinarytree/controller/GraphicsTree.java
similarity index 71%
rename from src/main/java/controller/GraphicsTree.java
rename to src/main/java/com/ericcanull/fxbinarytree/controller/GraphicsTree.java
index 5ac9235..450f890 100644
--- a/src/main/java/controller/GraphicsTree.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/controller/GraphicsTree.java
@@ -1,352 +1,344 @@
-package controller;
-
-import javafx.geometry.Point2D;
-import javafx.scene.canvas.Canvas;
-import javafx.scene.canvas.GraphicsContext;
-import javafx.scene.control.Alert;
-import javafx.scene.control.ButtonType;
-
-import tree.*;
-import shape.*;
-import java.util.Objects;
-
-/**
- * Draws the tree and updates the graphics to display according to the
- * searching, inserting, deleting, and traversal options.
- * @author Eric Canull
- * @version 1.0
- */
-@SuppressWarnings("serial")
-public final class GraphicsTree extends Canvas {
-
-	/**
-	 * The initial input values for the tree.
-	 */
-	private static final Integer[] NUMBERS_ARRAY = { 50, 25, 30, 12, 10, 75, 70, 80, 110 };
-
-	private BinarySearchTree tree;  	// The BST
-	private TreeIterator treeIterator;  // The BST Iterator
-	private Circle insertCircle;        // Insert circle 
-	private int maxTreeHeight; 			// Max tree height;
-
-	/**
-	 * Draws the tree and updates the graphics to display according to the
-	 * searching, inserting, deleting, and traversal options.
-	 */
-	public GraphicsTree() {
-
-		widthProperty().addListener(evt -> drawTree());
-		heightProperty().addListener(evt -> drawTree());
-
-		createTree();
-	}
-	
-	/**
-     * Changes the tree rendered by this panel.
-     */
-    public void setTree(BinarySearchTree root) {  tree = root; }
-
-	/**
-	 * Creates the initial binary search tree with the default values
-	 * in the numbers array.
-	 */
-	public void createTree() {
-
-		tree = new BinarySearchTree(); // Create an empty tree
-		setMaxTreeHeight(7); 		   // Set the default max tree height 
-
-		for (Integer number : NUMBERS_ARRAY) {
-			Circle circle = new Circle(number);
-			tree.insertItem(circle);
-		}
-
-		drawTree();
-	}
-
-	/**
-	 * Set the max tree height.
-	 * @param size a <code>Integer</code> number for the tree max size
-	 * @return An <code>Integer</code> max tree size
-	 */
-	private int setMaxTreeHeight(int size) {
-		this.maxTreeHeight = size;
-		return size;
-	}
-
-	/**
-	 * Searches for an search key number in the tree. If the number is found the tree will
-	 * be repainted to show the path. If the number cannot be found a notification
-	 * message will be displayed.
-	 * 
-	 * @param searchKey a <code>Integer</code> number for finding a tree.TreeNode
-	 */
-	public void search(Integer searchKey) {
-
-		// Try to search for a number.
-		try { 
-			tree.retrieveItem(searchKey); // number was found
-		} catch (NullPointerException e) { // Not found
-			//JOptionPane.showMessageDialog(null, searchKey + " was not found.");
-			tree.setResetColor(tree.root); // Reset color
-		}
-
-		drawTree();
-	}
-
-	/**
-	 * Prints the tree traversal order to the upper left-hand
-	 * side of the screen.
-	 * @return outputString
-	 */
-	public String printTree() {
-
-		// Traversal text output string
-		StringBuilder outputString = new StringBuilder();
-
-		// Add the next tree iterator to the output
-		while (treeIterator.hasNext()) {
-			outputString.append(treeIterator.next()).append(" ");
-		}
-
-		return outputString.toString(); // return the output string
-	}
-
-	/**
-	 * Retrieves the pre-order traversal option.
-	 */
-	public void setPreorder() {
-		treeIterator = new TreeIterator(tree);
-		treeIterator.setPreorder();
-	}
-
-	/**
-	 * Retrieves the in-order traversal option.
-	 */
-	public void setInorder() {
-		treeIterator = new TreeIterator(tree);
-		treeIterator.setInorder();
-	}
-
-	/**
-	 * Retrieves the post-order traversal option.
-	 */
-	public void setPostorder() {
-		treeIterator = new TreeIterator(tree);
-		treeIterator.setPostorder();
-	}
-
-	/**
-	 * Inserts a circle into the tree. If the tree height reaches the max height
-	 * displays an notification request to change the max height.
-	 * @param searchKey a <code>integer</code> number to insert in the tree
-	 */
-	public void insert(Integer searchKey) {
-		insertCircle = new Circle(searchKey);
-		tree.insertItem(insertCircle);
-		int heightOption = 2;
-		drawTree();
-
-
-	//	 If the height of the tree equals max height
-		if (tree.getHeight(tree.getRoot()) == maxTreeHeight) {
-			// Display option message
-
-			Alert alert = new Alert(Alert.AlertType.WARNING, "Reached max height. Would you like to increase the height?",
-					ButtonType.YES);
-			alert.showAndWait()
-					.filter(response -> response == ButtonType.YES)
-					.ifPresent(response -> alert.close());
-		}
-//			heightOption = JOptionPane.showConfirmDialog(null,
-//					"Reached max height. Would you like to increase the height?", " Height Adjust",
-//					JOptionPane.YES_NO_OPTION);
-
-			// Option 'Yes'selected: Change the height
-			if (heightOption == 0) {
-//				String height = JOptionPane.showInputDialog("Enter a new height between 7 and 10.");
-				heightOption = 7;
-				try {
-					int newHeight = heightOption;
-//					int newHeight = Integer.parseInt(heightOption);
-					// Confirm height input is within acceptable range
-					if (newHeight > tree.getHeight(tree.getRoot()) && newHeight <= 10) {
-						setMaxTreeHeight(newHeight);
-					} else {
-						throw new TreeException("tree.TreeException on change height.");
-					}
-
-					// Error occurred: Reverse changes and exit
-				} catch (NumberFormatException | TreeException e) {
-					Alert alert = new Alert(Alert.AlertType.WARNING, "Input error. The height was not changed.",
-							ButtonType.OK);
-					alert.showAndWait()
-							.filter(response -> response == ButtonType.OK)
-							.ifPresent(response -> alert.close());
-
-					tree.deleteItem(insertCircle.getSearchKey()); // Remove the inserted circle
-					tree.setResetColor(tree.root); 				  // Reset highlight flag for all nodes
-				}
-
-				// Option 'No' selected: Reverse changes and exit
-			} else if (heightOption == 1) {
-				Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "The number was not inserted.",
-						ButtonType.OK);
-				alert.showAndWait()
-						.filter(response -> response == ButtonType.OK)
-						.ifPresent(response -> alert.close());
-
-
-				tree.deleteItem(insertCircle.getSearchKey()); // Remove the inserted circle
-				tree.setResetColor(tree.root);                // Reset highlight flag for all nodes
-
-
-
-		} else {
-
-		}
-	}
-
-	/**
-	 * Deletes a number from the tree. If the number is not able to be deleted display
-	 * a notification message.
-	 * @param searchKey <code>integer</code> number to delete from the tree
-	 */
-	public void delete(Integer searchKey) {
-		try {
-			tree.deleteItem(searchKey);
-		} catch (TreeException e) {
-			//JOptionPane.showMessageDialog(null, "Unable to delete " + searchKey);
-		}
-
-		drawTree();
-	}
-
-	/**
-	 * Deletes all the nodes in the tree.
-	 */
-	public void makeEmpty() {
-		tree.makeEmpty();
-		maxTreeHeight = 6;
-        getGraphicsContext2D().clearRect(0, 0, getWidth(), getHeight());
-	}
-
-	/**
-	 * Draws the binary tree on the component.
-	 */
-	protected void drawTree() {
-		double width = getWidth();
-		double height = getHeight();
-
-		GraphicsContext gc = getGraphicsContext2D();
-		gc.clearRect(0, 0, width, height);
-
-		// If the tree is not empty; draw the lines and circles
-		if (tree.root != null) {
-		int treeHeight = tree.getHeight(tree.root);
-			
-			// Get the tree height
-			drawTree(gc, tree.getRoot(), 0, this.getWidth(), 0, this.getHeight() / treeHeight);
-			drawCircles(gc, tree.getRoot(), 0, this.getWidth(), 0, this.getHeight() / treeHeight);
-		}
-	}
-	
-	/**
-	 * Draws the lines recursively until there are no more tree nodes.
-	 * @param gc graphics2D class for extending drawing tools
-	 * @param treeNode a tree with <code>integer</code> index numbers
-	 * @param xMin the minimum width to draw on the component
-	 * @param xMax the minimum width to draw on the component
-	 * @param yMin the maximum width to draw on the component
-	 * @param yMax the maximum height to draw on the component
-	 */
-	protected void drawTree(GraphicsContext gc, TreeNode treeNode, double xMin, double xMax, double yMin, double yMax) {
-
-		Point2D linePoint1; 	// Point_1
-		Point2D linePoint2;   // Point_2
-		Line newLine = new Line();  // Blank line
-		
-		// If left node is not null then draw a line to it
-		if (treeNode.leftCircle != null) {
-			newLine.setHighlighter(false);
-			
-			if (treeNode.leftCircle.highlightFlag) {
-				newLine.setHighlighter(true);
-			}
-			
-			// Determine the start and end points of the line
-			linePoint1 = new Point2D(((xMin + xMax) / 2), yMin + yMax / 2);
-			linePoint2 = new Point2D(((xMin + (xMin + xMax) / 2) / 2), yMin + yMax + yMax / 2);
-			newLine.setPoint(linePoint1, linePoint2);// Set the points
-			newLine.draw(gc);// Draw the line
-			
-			// Recurse left circle nodes
-			drawTree(gc, treeNode.leftCircle, xMin, (xMin + xMax) / 2, yMin + yMax, yMax);
-		}
-
-		// If right node is not null then draw a line to it
-		if (treeNode.rightCircle != null) {
-			newLine.setHighlighter(false);
-			
-			// Color the line if the tree circle is flagged for color 
-			if (treeNode.rightCircle.highlightFlag) {
-				newLine.setHighlighter(true);
-			}
-	
-			// Determine the start and end points of the line
-			linePoint1 = new Point2D((xMin + xMax) / 2, yMin + yMax / 2);
-			linePoint2 = new Point2D((xMax + (xMin + xMax) / 2) / 2, yMin + yMax + yMax / 2);
-			newLine.setPoint(linePoint1, linePoint2);
-			newLine.draw(gc);// Draw the line
-		
-			// Recurse right circle nodes
-			drawTree(gc, treeNode.rightCircle, (xMin + xMax) / 2, xMax, yMin + yMax, yMax);
-		}
-	}
-
-	/**
-	 * Draws circles for every root, parent and child tree nodes.
-	 * @param gc graphics2D class for expanding the drawing tools
-	 * @param treeNode a tree with <code>Integer</code> index numbers
-	 * @param xMin the minimum width to draw on the component
-	 * @param xMax the maximum width to draw on the component
-	 * @param yMin the minimum height to draw on the component
-	 * @param yMax the maximum height to draw on the component
-	 */
-	public void drawCircles(GraphicsContext gc, TreeNode treeNode, double xMin, double xMax, double yMin, double yMax) {
-
-		// Create a new point
-		Point2D point = new Point2D((xMin + xMax) / 2, yMin + yMax / 2);
-
-		// treeNodes are flagged for highlight: Search and insertion nodes
-		if (treeNode.highlightFlag || Objects.equals(treeNode.rootCircle, insertCircle)) {
-			insertCircle = null;		    // Reset insert circle
-			treeNode.highlightFlag = false; // Reset highlight flag
-			treeNode.rootCircle.setHighlighter(true); // Highlight turned on
-			treeNode.rootCircle.setPoint(point); 	
-
-			// default no highlight
-		} else {
-			treeNode.rootCircle.setHighlighter(false); // Highlight turned off
-			treeNode.rootCircle.setPoint(point);
-		}
-
-		// Draw the circle
-		treeNode.rootCircle.draw(gc);
-
-		// Recurse left circles
-		if (treeNode.leftCircle != null) {
-			drawCircles(gc, treeNode.leftCircle, xMin, (xMin + xMax) / 2, yMin + yMax,	yMax);
-		}
-
-		// Recurse right circles
-		if (treeNode.rightCircle != null) {
-			drawCircles(gc, treeNode.rightCircle, (xMin + xMax) / 2, xMax, yMin + yMax, yMax);
-		}
-	}
-
-	public void clearCanvas() {
-		getGraphicsContext2D().clearRect(0, 0, this.getWidth(), this.getHeight());
-	}
-}
-	
-
+package com.ericcanull.fxbinarytree.controller;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import com.ericcanull.fxbinarytree.shape.*;
+import com.ericcanull.fxbinarytree.tree.*;
+
+import java.util.Objects;
+
+/**
+ * Draws the tree and updates the graphics to display, according to the
+ * searching, inserting, deleting, and traversal options.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public final class GraphicsTree extends Canvas {
+
+	/**
+	 * The initial input values for the tree.
+	 */
+	private static final Integer[] NUMBERS_ARRAY = { 50, 25, 30, 12, 10, 75, 70, 80, 110 };
+
+	private BinarySearchTree tree;  	// The BST
+	private TreeIterator treeIterator;  // The BST Iterator
+	private Circle insertCircle;        // Insert circle 
+	private int maxTreeHeight; 			// Max tree height;
+
+	/**
+	 * Draws the tree and updates the graphics to display, according to the
+	 * searching, inserting, deleting, and traversal options.
+	 */
+	public GraphicsTree() {
+
+		widthProperty().addListener(evt -> drawTree());
+		heightProperty().addListener(evt -> drawTree());
+
+		createTree();
+	}
+
+	/**
+	 * Creates the initial binary search tree with the default values
+	 * in the number's array.
+	 */
+	public void createTree() {
+
+		tree = new BinarySearchTree(); // Create an empty tree
+		setMaxTreeHeight(7); 		   // Set the default max tree height 
+
+		for (Integer number : NUMBERS_ARRAY) {
+			Circle circle = new Circle(number);
+			tree.insertItem(circle);
+		}
+
+		drawTree();
+	}
+
+	/**
+	 * Set the max tree height.
+	 *
+	 * @param size a <code>Integer</code> number for the tree max size
+	 */
+	private void setMaxTreeHeight( int size) {
+		this.maxTreeHeight = size;
+	}
+
+	/**
+	 * Searches for a search key number in the tree.
+	 * If the number is found, the tree will
+	 * be repainted to show the path.
+	 * If the number cannot be found, a notification
+	 * message will be displayed.
+	 * 
+	 * @param searchKey a <code>Integer</code> number for finding a tree.TreeNode
+	 */
+	public void search(Integer searchKey) {
+
+		// Try to search for a number.
+		try { 
+			tree.retrieveItem(searchKey); // number was found
+		} catch (NullPointerException e) { // Not found
+			//JOptionPane.showMessageDialog(null, searchKey + " was not found.");
+			tree.setResetColor(tree.root); // Reset color
+		}
+
+		drawTree();
+	}
+
+	/**
+	 * Prints the tree traversal order to the upper left-hand
+	 * side of the screen.
+	 * @return outputString
+	 */
+	public String printTree() {
+
+		// Traversal text output string
+		StringBuilder outputString = new StringBuilder();
+
+		// Add the next tree iterator to the output
+		while (treeIterator.hasNext()) {
+			outputString.append(treeIterator.next()).append(" ");
+		}
+
+		return outputString.toString(); // return the output string
+	}
+
+	/**
+	 * Retrieves the pre-order traversal option.
+	 */
+	public void setPreorder() {
+		treeIterator = new TreeIterator(tree);
+		treeIterator.setPreorder();
+	}
+
+	/**
+	 * Retrieves the in-order traversal option.
+	 */
+	public void setInorder() {
+		treeIterator = new TreeIterator(tree);
+		treeIterator.setInorder();
+	}
+
+	/**
+	 * Retrieves the post-order traversal option.
+	 */
+	public void setPostorder() {
+		treeIterator = new TreeIterator(tree);
+		treeIterator.setPostorder();
+	}
+
+	/**
+	 * Inserts a circle into the tree. If the tree height reaches the max height
+	 * displays a notification request to change the max height.
+	 * @param searchKey a <code>integer</code> number to insert in the tree
+	 */
+	@SuppressWarnings ("ConstantValue")
+	public void insert( Integer searchKey) {
+		insertCircle = new Circle(searchKey);
+		tree.insertItem(insertCircle);
+		int heightOption = 2;
+		drawTree();
+
+
+		// If the height of the tree equals max height
+		if (tree.getHeight(tree.getRoot()) == maxTreeHeight) {
+			// Display option message
+
+			Alert alert = new Alert(Alert.AlertType.WARNING, "Reached max height. Would you like to increase the height?",
+					ButtonType.YES);
+			alert.showAndWait()
+					.filter(response -> response == ButtonType.YES)
+					.ifPresent(response -> alert.close());
+		}
+
+		// Option 'Yes' selected: Change the height
+		if (heightOption == 0) {
+//				String height = JOptionPane.showInputDialog("Enter a new height between 7 and 10.");
+			heightOption = 7;
+			try {
+				// Confirm height input is within acceptable range
+				if ( heightOption > tree.getHeight(tree.getRoot()) && heightOption <= 10) {
+					setMaxTreeHeight(heightOption);
+				} else {
+					throw new TreeException("tree.TreeException on change height.");
+				}
+
+				// Error occurred: Reverse changes and exit
+			} catch (NumberFormatException | TreeException e) {
+				Alert alert = new Alert(Alert.AlertType.WARNING, "Input error. The height was not changed.",
+						ButtonType.OK);
+				alert.showAndWait()
+						.filter(response -> response == ButtonType.OK)
+						.ifPresent(response -> alert.close());
+
+				tree.deleteItem(insertCircle.getSearchKey()); // Remove the inserted circle
+				tree.setResetColor(tree.root); 				  // Reset highlight flag for all nodes
+			}
+
+			// Option 'No' selected: Reverse changes and exit
+		} else if (heightOption == 1) {
+			Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "The number was not inserted.",
+					ButtonType.OK);
+			alert.showAndWait()
+					.filter(response -> response == ButtonType.OK)
+					.ifPresent(response -> alert.close());
+
+
+			tree.deleteItem(insertCircle.getSearchKey()); // Remove the inserted circle
+			tree.setResetColor(tree.root);                // Reset highlight flag for all nodes
+
+
+
+		}
+	}
+
+	/**
+	 * Deletes a number from the tree.
+	 * If the number is not able to be deleted, display
+	 * a notification message.
+	 * @param searchKey <code>integer</code> number to delete from the tree
+	 */
+	public void delete(Integer searchKey) {
+		try {
+			tree.deleteItem(searchKey);
+		} catch (TreeException e) {
+			//JOptionPane.showMessageDialog(null, "Unable to delete " + searchKey);
+		}
+
+		drawTree();
+	}
+
+	/**
+	 * Deletes all the nodes in the tree.
+	 */
+	public void makeEmpty() {
+		tree.makeEmpty();
+		maxTreeHeight = 6;
+        getGraphicsContext2D().clearRect(0, 0, getWidth(), getHeight());
+	}
+
+	/**
+	 * Draws the binary tree on the component.
+	 */
+    private void drawTree( ) {
+		double width = getWidth();
+		double height = getHeight();
+
+		GraphicsContext gc = getGraphicsContext2D();
+		gc.clearRect(0, 0, width, height);
+
+		// If the tree is not empty, draw the lines and circles
+		if (tree.root != null) {
+		int treeHeight = tree.getHeight(tree.root);
+			
+			// Get the tree height
+			drawTree(gc, tree.getRoot(), 0, this.getWidth(), 0, this.getHeight() / treeHeight);
+			drawCircles(gc, tree.getRoot(), 0, this.getWidth(), 0, this.getHeight() / treeHeight);
+		}
+	}
+	
+	/**
+	 * Draws the lines recursively until there are no more tree nodes.
+	 * @param gc graphics2D class for extending drawing tools
+	 * @param treeNode a tree with <code>integer</code> index numbers
+	 * @param xMin the minimum width to draw on the component
+	 * @param xMax the minimum width to draw on the component
+	 * @param yMin the maximum width to draw on the component
+	 * @param yMax the maximum height to draw on the component
+	 */
+    private void drawTree( GraphicsContext gc, TreeNode treeNode, double xMin, double xMax, double yMin, double yMax ) {
+
+		Point2D linePoint1; 	// Point_1
+		Point2D linePoint2;   // Point_2
+		Line newLine = new Line();  // Blank line
+		
+		// If the left node is not null, then draw a line to it
+		if (treeNode.leftCircle != null) {
+			newLine.setHighlighter(false);
+			
+			if (treeNode.leftCircle.highlightFlag) {
+				newLine.setHighlighter(true);
+			}
+			
+			// Determine the start and end points of the line
+			linePoint1 = new Point2D(((xMin + xMax) / 2), yMin + yMax / 2);
+			linePoint2 = new Point2D(((xMin + (xMin + xMax) / 2) / 2), yMin + yMax + yMax / 2);
+			newLine.setPoint(linePoint1, linePoint2);// Set the points
+			newLine.draw(gc);// Draw the line
+			
+			// Recurse left circle nodes
+			drawTree(gc, treeNode.leftCircle, xMin, (xMin + xMax) / 2, yMin + yMax, yMax);
+		}
+
+		// If the right node is not null, then draw a line to it
+		if (treeNode.rightCircle != null) {
+			newLine.setHighlighter(false);
+			
+			// Color the line if the tree circle is flagged for color 
+			if (treeNode.rightCircle.highlightFlag) {
+				newLine.setHighlighter(true);
+			}
+	
+			// Determine the start and end points of the line
+			linePoint1 = new Point2D((xMin + xMax) / 2, yMin + yMax / 2);
+			linePoint2 = new Point2D((xMax + (xMin + xMax) / 2) / 2, yMin + yMax + yMax / 2);
+			newLine.setPoint(linePoint1, linePoint2);
+			newLine.draw(gc);// Draw the line
+		
+			// Recurse right circle nodes
+			drawTree(gc, treeNode.rightCircle, (xMin + xMax) / 2, xMax, yMin + yMax, yMax);
+		}
+	}
+
+	/**
+	 * Draws circles for every root, parent and child tree node.
+	 * @param gc graphics2D class for expanding the drawing tools
+	 * @param treeNode a tree with <code>Integer</code> index numbers
+	 * @param xMin the minimum width to draw on the component
+	 * @param xMax the maximum width to draw on the component
+	 * @param yMin the minimum height to draw on the component
+	 * @param yMax the maximum height to draw on the component
+	 */
+	@SuppressWarnings ("ClassEscapesDefinedScope")
+	public void drawCircles( GraphicsContext gc, TreeNode treeNode, double xMin, double xMax, double yMin, double yMax) {
+
+		// Create a new point
+		Point2D point = new Point2D((xMin + xMax) / 2, yMin + yMax / 2);
+
+		// treeNodes are flagged for highlight: Search and insertion nodes
+		if (treeNode.highlightFlag || Objects.equals(treeNode.rootCircle, insertCircle)) {
+			insertCircle = null;		    // Reset insert circle
+			treeNode.highlightFlag = false; // Reset highlight flag
+			treeNode.rootCircle.setHighlighter(true); // Highlight turned on
+			treeNode.rootCircle.setPoint(point); 	
+
+			// default no highlight
+		} else {
+			treeNode.rootCircle.setHighlighter(false); // Highlight turned off
+			treeNode.rootCircle.setPoint(point);
+		}
+
+		// Draw the circle
+		treeNode.rootCircle.draw(gc);
+
+		// Recurse left circles
+		if (treeNode.leftCircle != null) {
+			drawCircles(gc, treeNode.leftCircle, xMin, (xMin + xMax) / 2, yMin + yMax,	yMax);
+		}
+
+		// Recurse right circles
+		if (treeNode.rightCircle != null) {
+			drawCircles(gc, treeNode.rightCircle, (xMin + xMax) / 2, xMax, yMin + yMax, yMax);
+		}
+	}
+
+	@SuppressWarnings("unused")
+	public void clearCanvas() {
+		getGraphicsContext2D().clearRect(0, 0, this.getWidth(), this.getHeight());
+	}
+}
+	
+
diff --git a/src/main/java/shape/Circle.java b/src/main/java/com/ericcanull/fxbinarytree/shape/Circle.java
similarity index 72%
rename from src/main/java/shape/Circle.java
rename to src/main/java/com/ericcanull/fxbinarytree/shape/Circle.java
index ad7d941..05575e4 100644
--- a/src/main/java/shape/Circle.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/shape/Circle.java
@@ -1,202 +1,175 @@
-package shape;
-
-import com.sun.javafx.tk.FontMetrics;
-import com.sun.javafx.tk.Toolkit;
-import javafx.geometry.Point2D;
-import javafx.scene.canvas.GraphicsContext;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import javafx.scene.text.FontWeight;
-
-
-/**
- * Creates a circle object with methods for controlling it's point locale,
- * background color, border color, font color, and number id.
- * @author Eric Canull
- * @version 1.0
- */
-public final class Circle {
-	
-	/**
-	 * The font for the numbers inside the circle.
-	 */
-	final Font font =  Font.font("Cooper Black", FontWeight.BOLD, 16);
-	final FontMetrics fm = Toolkit.getToolkit().getFontLoader().getFontMetrics(font);
-
-	/**
-	 * The radius of the circle.
-	 */
-	public static final int RADIUS = 26;
-	
-	/**
-	 * The search key for searching and deleting circles.
-	 */
-	private final Integer searchKey;
-	
-	// The circle attributes
-	private Point2D point;
-	private Color backgroundColor;
-	private Color borderColor;
-	private Color fontColor;
-
-	/**
-	 * Creates a circle object with methods for controlling it's point locale,
-	 * background color, border color, font color, search key.
-	 * @param searchKey a <code>Integer</code> search key for searching and deleting within an index.
-	 */
-	public Circle(Integer searchKey) {
-		this.searchKey = searchKey;
-		this.backgroundColor = Color.web("#FCFCFC");
-	}
-	
-	/**
-	 * 
-	 * @param searchKey a integer id number for searching and deleting from an index.
-	 * @param point a Cartesian coordinate using x and y float numbers.
-	 */
-	public Circle(Integer searchKey, Point2D point) {
-		this.searchKey = searchKey;
-		this.point = point;
-		this.backgroundColor = Color.rgb(49, 116, 222);
-		this.setBorderColor(Color.rgb(99, 99, 99));
-		this.fontColor = Color.web("#FCFCFC");
-		
-	}
-
-	/**
-	 * Draws the circle at a new position
-	 * @param gc The graphics object to use for drawing to a component
-	 */
-	public void draw(GraphicsContext gc) {
-		//(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		gc.setLineWidth(3); // Sets the width of the lines
-		
-		// Create a circle 
-		gc.setFill(backgroundColor);
-		gc.fillOval(point.getX() - RADIUS, point.getY() - RADIUS, 2 * RADIUS, 2 * RADIUS);
-		
-		// Outline the circle border
-		gc.setStroke(borderColor);
-		gc.strokeOval(point.getX() - RADIUS, point.getY() - RADIUS, 2 * RADIUS, 2 * RADIUS);
-
-		// Draw the id number inside the circle
-		gc.setFont(font);
-		gc.setFill(getFontColor());
-		gc.fillText(getKey(),
-				 point.getX() - (fm.computeStringWidth(getKey()) / 2),
-				 point.getY() + (fm.getAscent() / 4));
-	}
-
-	private String getKey() {
-		return Integer.toString(getSearchKey());
-	}
-	/**
-	 * Get the search key number.
-	 * @return A integer of the circle index value. 
-	 */
-	public Integer getSearchKey() {
-		return this.searchKey;
-	}
-	
-	/**
-	 * Gets the border color.
-	 * @return A color for the circle border
-	 */
-	public Color getBorderColor() {
-		return borderColor;
-	}
-	
-	/**
-	 * Sets the border color.
-	 * @param borderColor
-	 */
-	private void setBorderColor(Color borderColor) {
-		this.borderColor = borderColor;
-	}
-	
-	/**
-	 * Gets the point coordinates.
-	 * @return 
-	 */
-	public Point2D getPoint() {
-		return point;
-	}
-	
-	/**
-	 * Sets the point coordinates.
-	 * @param point
-	 */
-	public void setPoint(Point2D point) {
-		this.point = point;
-	}
-	
-	/**
-	 * Gets the background color.
-	 * @return
-	 */
-	public Color getBackgroundColor() {
-		return backgroundColor;
-	}
-	
-	/**
-	 * Sets the background color.
-	 * @param color 
-	 */
-	private void setBackgroundColor(Color color) {
-		this.backgroundColor = color;
-	}
-	
-	/**
-	 * Gets the circle radius.
-	 * @return
-	 */
-	public int getRadius() {
-		return RADIUS;
-	}
-	
-	/**
-	 * Gets the font color.
-	 * @return
-	 */
-	public Color getFontColor() {
-		return this.fontColor;
-	}
-	
-	/**
-	 * Sets the font color.
-	 * @param fontColor
-	 */
-	private void setFontColor(Color fontColor) {
-		this.fontColor = fontColor;
-	}
-	
-	/**
-	 * Sets the circle to use highlighted colors if the parameter 
-	 * is true.
-	 * @param highlight a boolean value for switching on/off highlighted colors
-	 */
-	public void setHighlighter(boolean highlight) {
-		if (highlight) {
-			setFontColor(Color.rgb(49, 116, 222));
-			setBackgroundColor(Color.rgb(155, 244, 167));
-			setBorderColor(Color.rgb(49, 116, 222));
-	
-		} else {
-			setFontColor(Color.web("#FCFCFC"));
-			setBackgroundColor(Color.rgb(49, 116, 222));
-			setBorderColor(Color.rgb(99, 99, 99));
-		}
-	}
-
-	/**
-	 * Overrides the default toString method and gets the String representation
-	 * of a circle.
-	 * @return A String representation of the circle object.
-	 */
-	@Override
-	public String toString() {
-		
-		return "Search Key# " + searchKey  + 
-				" (x,y) = ("  + point.getX() + ", " + point.getY() + ")";
-	}
-}
+package com.ericcanull.fxbinarytree.shape;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
+import javafx.scene.text.Text;
+
+
+/**
+ * Creates a circle object with methods for controlling its point locale,
+ * background color, border color, font color, and number id.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public final class Circle {
+	
+	/**
+	 * The font for the numbers inside the circle.
+	 */
+	final Font font =  Font.font("Cooper Black", FontWeight.BOLD, 16);
+
+	/**
+	 * The radius of the circle.
+	 */
+	public static final int RADIUS = 26;
+	
+	/**
+	 * The search key for searching and deleting circles.
+	 */
+	private final Integer searchKey;
+	
+	// The circle attributes
+	private Point2D point;
+	private Color backgroundColor;
+	private Color borderColor;
+	private Color fontColor;
+
+	/**
+	 * Creates a circle object with methods for controlling its point locale,
+	 * background color, border color, font color, search key.
+	 * @param searchKey a <code>Integer</code> search key for searching and deleting within an index.
+	 */
+	public Circle(Integer searchKey) {
+		this.searchKey = searchKey;
+		this.backgroundColor = Color.web("#FCFCFC");
+	}
+	
+	/**
+	 * 
+	 * @param searchKey an integer id number for searching and deleting from an index.
+	 * @param point a Cartesian coordinate using x and y float numbers.
+	 */
+	@SuppressWarnings("unused")
+	public Circle(Integer searchKey, Point2D point) {
+		this.searchKey = searchKey;
+		this.point = point;
+		this.backgroundColor = Color.rgb(49, 116, 222);
+		this.setBorderColor(Color.rgb(99, 99, 99));
+		this.fontColor = Color.web("#FCFCFC");
+		
+	}
+
+	/**
+	 * Draws the circle at a new position
+	 * @param gc The graphics object to use for drawing to a component
+	 */
+	public void draw(GraphicsContext gc) {
+		//(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		gc.setLineWidth(3); // Sets the width of the lines
+
+		// Create a circle
+		gc.setFill(backgroundColor);
+		gc.fillOval(point.getX() - RADIUS, point.getY() - RADIUS, 2 * RADIUS, 2 * RADIUS);
+
+		// Outline the circle border
+		gc.setStroke(borderColor);
+		gc.strokeOval(point.getX() - RADIUS, point.getY() - RADIUS, 2 * RADIUS, 2 * RADIUS);
+
+		// Draw the id number inside the circle
+		gc.setFont(font);
+		gc.setFill(getFontColor());
+
+		Text text = new Text(getKey());
+		text.setFont(font);
+		double width = text.getLayoutBounds().getWidth();
+
+		gc.fillText(getKey(),
+					point.getX() - (width / 2),
+					point.getY() + (font.getSize() / 4)); // approximate centering for the height
+	}
+
+	private String getKey() {
+		return Integer.toString(getSearchKey());
+	}
+	/**
+	 * Get the search key number.
+	 * @return An integer of the circle index value.
+	 */
+	public Integer getSearchKey() {
+		return this.searchKey;
+	}
+
+	/**
+	 * Set the border color of the Circle.
+	 *
+	 * @param borderColor The color to set as the border color.
+	 */
+	private void setBorderColor(Color borderColor) {
+		this.borderColor = borderColor;
+	}
+
+	/**
+	 * Sets the point coordinates.
+	 * @param point A Cartesian coordinate
+	 */
+	public void setPoint(Point2D point) {
+		this.point = point;
+	}
+
+	/**
+	 * Sets the background color.
+	 * @param color  A color object
+	 */
+	private void setBackgroundColor(Color color) {
+		this.backgroundColor = color;
+	}
+
+	/**
+	 * Gets the font color.
+	 * @return A color object
+	 */
+	public Color getFontColor() {
+		return this.fontColor;
+	}
+	
+	/**
+	 * Sets the font color.
+	 * @param fontColor A color object
+	 */
+	private void setFontColor(Color fontColor) {
+		this.fontColor = fontColor;
+	}
+	
+	/**
+	 * Sets the circle to use highlighted colors if the parameter 
+	 * is true.
+	 * @param highlight a boolean value for switching on/off highlighted colors
+	 */
+	public void setHighlighter(boolean highlight) {
+		if (highlight) {
+			setFontColor(Color.rgb(49, 116, 222));
+			setBackgroundColor(Color.rgb(155, 244, 167));
+			setBorderColor(Color.rgb(49, 116, 222));
+	
+		} else {
+			setFontColor(Color.web("#FCFCFC"));
+			setBackgroundColor(Color.rgb(49, 116, 222));
+			setBorderColor(Color.rgb(99, 99, 99));
+		}
+	}
+
+	/**
+	 * Overrides the default toString method and gets the String representation
+	 * of a circle.
+	 * @return A String representation of the circle object.
+	 */
+	@Override
+	public String toString() {
+		
+		return "Search Key# " + searchKey  + 
+				" (x,y) = ("  + point.getX() + ", " + point.getY() + ")";
+	}
+}
diff --git a/src/main/java/shape/Line.java b/src/main/java/com/ericcanull/fxbinarytree/shape/Line.java
similarity index 89%
rename from src/main/java/shape/Line.java
rename to src/main/java/com/ericcanull/fxbinarytree/shape/Line.java
index bce48ef..398c615 100644
--- a/src/main/java/shape/Line.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/shape/Line.java
@@ -1,109 +1,111 @@
-package shape;
-
-import javafx.geometry.Point2D;
-import javafx.scene.canvas.GraphicsContext;
-import javafx.scene.paint.Color;
-
-/**
- * Creates a line object with methods for controlling it's point locale,
- * color, and size.
- * @author Eric Canull
- * @version 1.0
- */
-public final class Line {
-	
-	/**
-	 * Default color is the panel foreground.
-	 */
-	private static final Color UI_DEFAULT_COLOR = Color.rgb(99, 99, 99);
-	
-	/**
-	 * Highlight color for searching and inserting.
-	 */
-	private static final Color HIGHLIGHT_COLOR = Color.rgb(49, 116, 222);
-	
-	// The circle attributes
-	private Point2D point, point2;
-	private Color color;
-	
-	/**
-	 * Creates a line object with methods for controlling it's point locale,
-	 * background color, border color, font color, and number id.
-	 */
-	public Line() {
-		this.color = UI_DEFAULT_COLOR;
-	}
-	
-	/**
-	 * 
-	 * @param point a Cartesian coordinate using x and y float numbers.
-	 */
-	public Line(Point2D point, Point2D point2) {
-		this.point = point;
-		this.point2 = point;
-		this.color = UI_DEFAULT_COLOR;
-	}
-
-	/**
-	 * Draws the line at a specified position
-	 * @param gc The graphics object to use for drawing to a component
-	 */
-	public void draw(GraphicsContext gc) {
-	//	g2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		gc.setLineWidth(4); // Sets the width of the lines
-
-		// Fill the line
-		gc.setStroke(color);
-		gc.strokeLine(point.getX(), point.getY(), point2.getX(), point2.getY());
-	}
-	
-	/**
-	 * Gets the point coordinates.
-	 * @return A point 
-	 */
-	public Point2D getPoint() {
-		return point;
-	}
-	
-	/**
-	 * Sets the point coordinates.
-	 * @param point A Cartesian coordinate
-	 */
-	public void setPoint(Point2D point, Point2D point2) {
-		this.point = point;
-		this.point2 = point2;
-	}
-	
-	/**
-	 * Gets the point coordinates.
-	 * @return A Cartesian coordinate
-	 */
-	public Point2D getPoint2() {
-		return point2;
-	}
-	
-	/**
-	 * Sets the line to use highlighted colors if the parameter 
-	 * is true.
-	 * @param highlight a boolean value for switching on/off highlighted colors
-	 */
-	public void setHighlighter(boolean highlight) {
-		if (highlight) {
-			this.color = HIGHLIGHT_COLOR;
-		} else {
-			this.color = UI_DEFAULT_COLOR;
-		}
-	}
-
-	/**
-	 * Overrides the default toString method and gets the String representation
-	 * of a line.
-	 * @return A String representation of the line
-	 */
-	@Override
-	public String toString() {
-		
-		return " (x,y) = ("  + point.getX() + ", " + point.getY() + ")"
-			+  " (x,y) = ("  + point2.getX() + ", " + point2.getY()+ ")";
-	}
-}
+package com.ericcanull.fxbinarytree.shape;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.paint.Color;
+
+/**
+ * Creates a line object with methods for controlling its point locale,
+ * color, and size.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public final class Line {
+	
+	/**
+	 * Default color is the panel foreground.
+	 */
+	private static final Color UI_DEFAULT_COLOR = Color.rgb(99, 99, 99);
+	
+	/**
+	 * Highlight color for searching and inserting.
+	 */
+	private static final Color HIGHLIGHT_COLOR = Color.rgb(49, 116, 222);
+	
+	// The circle attributes
+	private Point2D point, point2;
+	private Color color;
+	
+	/**
+	 * Creates a line object with methods for controlling its point locale,
+	 * background color, border color, font color, and number id.
+	 */
+	public Line() {
+		this.color = UI_DEFAULT_COLOR;
+	}
+	
+	/**
+	 * 
+	 * @param point a Cartesian coordinate using x and y float numbers.
+	 */
+	@SuppressWarnings("unused")
+	public Line(Point2D point, Point2D point2) {
+		this.point = point;
+		this.point2 = point;
+		this.color = UI_DEFAULT_COLOR;
+	}
+
+	/**
+	 * Draws the line at a specified position
+	 * @param gc The graphics object to use for drawing to a component
+	 */
+	public void draw(GraphicsContext gc) {
+	//	g2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		gc.setLineWidth(4); // Sets the width of the lines
+
+		// Fill the line
+		gc.setStroke(color);
+		gc.strokeLine(point.getX(), point.getY(), point2.getX(), point2.getY());
+	}
+	
+	/**
+	 * Gets the point coordinates.
+	 * @return A point 
+	 */@SuppressWarnings("unused")
+	public Point2D getPoint() {
+		return point;
+	}
+	
+	/**
+	 * Sets the point coordinates.
+	 * @param point A Cartesian coordinate
+	 */
+	public void setPoint(Point2D point, Point2D point2) {
+		this.point = point;
+		this.point2 = point2;
+	}
+	
+	/**
+	 * Gets the point coordinates.
+	 * @return A Cartesian coordinate
+	 */
+	@SuppressWarnings("unused")
+	public Point2D getPoint2() {
+		return point2;
+	}
+	
+	/**
+	 * Sets the line to use highlighted colors if the parameter 
+	 * is true.
+	 * @param highlight a boolean value for switching on/off highlighted colors
+	 */
+	public void setHighlighter(boolean highlight) {
+		if (highlight) {
+			this.color = HIGHLIGHT_COLOR;
+		} else {
+			this.color = UI_DEFAULT_COLOR;
+		}
+	}
+
+	/**
+	 * Overrides the default toString method and gets the String representation
+	 * of a line.
+	 * @return A String representation of the line
+	 */
+	@Override
+	public String toString() {
+		
+		return " (x,y) = ("  + point.getX() + ", " + point.getY() + ")"
+			+  " (x,y) = ("  + point2.getX() + ", " + point2.getY()+ ")";
+	}
+}
diff --git a/src/main/java/tree/BinarySearchTree.java b/src/main/java/com/ericcanull/fxbinarytree/tree/BinarySearchTree.java
similarity index 77%
rename from src/main/java/tree/BinarySearchTree.java
rename to src/main/java/com/ericcanull/fxbinarytree/tree/BinarySearchTree.java
index eecf114..626318d 100644
--- a/src/main/java/tree/BinarySearchTree.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/tree/BinarySearchTree.java
@@ -1,262 +1,255 @@
-package tree;
-
-import java.util.Objects;
-import shape.Circle;
-
-/**
- * Binary search tree. 
- * Inherits isEmpty(), makeEmpty(), getRootItem(), and the
- * use of the constructors from tree.BinaryTreeBasis Assumption: A tree contains at
- * most one item with a given search key at any time.
- * 
- * @author Eric Canull
- * @version 1.0
- */
-public final class BinarySearchTree extends BinaryTreeBasis {
-
-	/**
-	 * Binary search tree.
-	 */
-	public BinarySearchTree() {
-		this.root = null;
-	}
-
-	/**
-	 * Binary search tree.
-	 * @param rootCircle
-	 * @Overload Default constructor
-	 */
-	public BinarySearchTree(Circle rootCircle) {
-		super(rootCircle);
-	}
-
-	/**
-	 * Inserts a new circle into the tree.
-	 * @param newCircle
-	 */
-	public void insertItem(Circle newCircle) {
-		root = insertItem(root, newCircle);
-	}
-	
-	/**
-	 * Inserts a new circle into the tree.
-	 * @param tNode a tree node
-	 * @param newCircle a new circle
-	 * @return 
-	 * @Overload insertItem() 
-	 */
-	protected TreeNode insertItem(TreeNode tNode, Circle newCircle) {
-		TreeNode newSubtree;
-		
-		if (tNode == null) {
-			tNode = new TreeNode(newCircle, null, null);
-			return tNode;
-		}
-		
-		Circle nodeItem = tNode.rootCircle;
-
-		if(Objects.equals(newCircle.getSearchKey(), nodeItem.getSearchKey())) {
-		    return tNode;
-        }
-
-		if (newCircle.getSearchKey() < nodeItem.getSearchKey()) {
-			newSubtree = insertItem(tNode.leftCircle, newCircle);
-			tNode.leftCircle = newSubtree;
-			return tNode;
-		}
-		
-		newSubtree = insertItem(tNode.rightCircle, newCircle);
-		tNode.rightCircle = newSubtree;
-		return tNode;
-	}
-	
-	/**
-	 * Retrieves a circle from the tree.
-	 * @param searchKey a unique identifying value
-	 * @return An integer search key number
-	 */
-	public Integer retrieveItem(Integer searchKey) {
-		return retrieveItem(root, searchKey);
-	}
-	
-	
-	/**
-	 * Searches for a circle from the tree.
-	 * @param tNode a tree node 
-	 * @param searchKey a unique identifying value
-	 * @return An integer search key number
-	 * @Overload retrieveItem()
-	 */
-	protected Integer retrieveItem(TreeNode tNode, Integer searchKey) {
-		Integer treeItem;
-		if (tNode == null) {
-			treeItem = null;
-
-		} else {
-			tNode.highlightFlag = true;
-			Circle nodeItem = tNode.rootCircle;
-			if (Objects.equals(searchKey, nodeItem.getSearchKey())) {
-				tNode.highlightFlag = true;
-				treeItem = tNode.rootCircle.getSearchKey();
-			} else if (searchKey < nodeItem.getSearchKey()) {
-				tNode.leftCircle.highlightFlag = true;
-				treeItem = retrieveItem(tNode.leftCircle, searchKey);
-			} else {
-				tNode.rightCircle.highlightFlag = true;
-				treeItem = retrieveItem(tNode.rightCircle, searchKey);
-			}
-		}
-
-		return treeItem;
-	}
-	
-	/**
-	 * Deletes a circle from the tree.
-	 * @param searchKey a unique identifying value
-	 * @throws TreeException if search key cannot be located.
-	 */
-	public void deleteItem(Integer searchKey) throws TreeException {
-		root = deleteItem(root, searchKey);
-	}
-	
-	/**
-	 * Deletes a circle from the tree.
-	 * @param tNode a tree node 
-	 * @param searchKey a unique identifying value
-	 * @return A tree.TreeNode from within the tree
-	 * @Overload deleteItem()
-	 */
-	protected TreeNode deleteItem(TreeNode tNode, Integer searchKey) {
-		TreeNode newSubtree;
-		
-		if (tNode == null) {
-			throw new TreeException("tree.TreeException: Item not found");
-		}
-		
-		Circle nodeItem = tNode.rootCircle;
-		if (Objects.equals(searchKey, nodeItem.getSearchKey())) {
-			tNode = deleteNode(tNode);
-
-		} else if (searchKey < nodeItem.getSearchKey()) {
-			newSubtree = deleteItem(tNode.leftCircle, searchKey);
-			tNode.leftCircle = newSubtree;
-		}
-
-		else {
-			newSubtree = deleteItem(tNode.rightCircle, searchKey);
-			tNode.rightCircle = newSubtree;
-		}
-
-		return tNode;
-	}
-	
-	/**
-	 * Helper method finds and replaces a deleted node. 
-	 * @param tNode A tree.TreeNode from within the tree
-	 * @return A tree.TreeNode from within the tree
-	 */
-	protected TreeNode deleteNode(TreeNode tNode) {
-
-		Circle replacementItem;
-
-		if ((tNode.leftCircle == null) && (tNode.rightCircle == null)) {
-			return null;
-		}
-
-		else if (tNode.leftCircle == null) {
-			return tNode.rightCircle;
-		}
-
-		else if (tNode.rightCircle == null) {
-			return tNode.leftCircle;
-		} else {
-
-			replacementItem = findLeftmost(tNode.rightCircle);
-			tNode.rootCircle = replacementItem;
-			tNode.rightCircle = deleteLeftmost(tNode.rightCircle);
-			return tNode;
-		}
-	}
-
-	/**
-	 * Helper method for searching and deleting left-side nodes.
-	 * @param tNode
-	 * @return
-	 */
-	protected Circle findLeftmost(TreeNode tNode) {
-		if (tNode.leftCircle == null) {
-			return tNode.rootCircle;
-		}
-		return findLeftmost(tNode.leftCircle);
-	}
-	
-	/**
-	 * Helper method for searching and deleting right-side nodes.
-	 * @param tNode
-	 * @return
-	 */
-	protected TreeNode deleteLeftmost(TreeNode tNode) {
-		if (tNode.leftCircle == null) {
-			return tNode.rightCircle;
-		}
-		tNode.leftCircle = deleteLeftmost(tNode.leftCircle);
-		return tNode;
-	}
-	
-	/**
-	 * Resets the color to the default.
-	 * @param tNode
-	 */
-	public void setResetColor(TreeNode tNode) {
-		 resetColor(tNode);
-	}
-	
-	
-	/**
-	 * Resets the color to the default.
-	 * @param tNode A node in the tree
-	 * @Overload
-	 */
-	protected void resetColor(TreeNode tNode) {
-		if (tNode != null) {
-			tNode.highlightFlag = false;
-
-			if (tNode.leftCircle != null) {
-				tNode.leftCircle.highlightFlag = false;
-			}
-
-			if (tNode.rightCircle != null) {
-				tNode.rightCircle.highlightFlag = false;
-			}
-			resetColor(tNode.leftCircle);
-			resetColor(tNode.rightCircle);
-		}
-	}
-
-	/**
-	 * Gets the height of the tree
-	 * @param root
-	 * @return
-	 */
-	public int getHeight(TreeNode root) {
-		if (root == null)
-			return 0;
-		return Math.max(getHeight(root.leftCircle), getHeight(root.rightCircle)) + 1;
-	}
-	
-	/**
-	 * Gets the size of the tree
-	 * @param root
-	 * @return
-	 */
-	public int getSize(TreeNode root) {
-		if (root == null)
-			return 0;
-		return (getSize(root.leftCircle) + getSize(root.rightCircle)) + 1;
-	}
-	
-	@Override
-	public void setRootItem(Circle newItem) {
-		root = new TreeNode(newItem, null, null);
-	}
-}
+package com.ericcanull.fxbinarytree.tree;
+
+import com.ericcanull.fxbinarytree.shape.Circle;
+
+import java.util.Objects;
+
+/**
+ * Binary search tree. 
+ * Inherits isEmpty(), makeEmpty(), getRootItem(), and the
+ * use of the constructors from tree.BinaryTreeBasis Assumption: A tree contains at
+ * most one item with a given search key at any time.
+ * 
+ * @author Eric Canull
+ * @version 1.0
+ */
+public final class BinarySearchTree extends BinaryTreeBasis {
+
+	/**
+	 * Binary search tree.
+	 */
+	public BinarySearchTree() {
+		this.root = null;
+	}
+
+	/**
+	 * Binary search tree.
+	 * @param rootCircle a shape.Circle object with a tree search key
+	 */
+	@SuppressWarnings("unused")
+	public BinarySearchTree(Circle rootCircle) {
+		super(rootCircle);
+	}
+
+	/**
+	 * Inserts a new circle into the tree.
+	 * @param newCircle a new circle
+	 */
+	public void insertItem(Circle newCircle) {
+		root = insertItem(root, newCircle);
+	}
+	
+	/**
+	 * Inserts a new circle into the tree.
+	 * @param tNode a tree node
+	 * @param newCircle a new circle
+	 * @return A tree.TreeNode from within the tree
+	 */
+    private TreeNode insertItem( TreeNode tNode, Circle newCircle ) {
+		TreeNode newSubtree;
+		
+		if (tNode == null) {
+			tNode = new TreeNode(newCircle);
+			return tNode;
+		}
+		
+		Circle nodeItem = tNode.rootCircle;
+
+		if(Objects.equals(newCircle.getSearchKey(), nodeItem.getSearchKey())) {
+		    return tNode;
+        }
+
+		if (newCircle.getSearchKey() < nodeItem.getSearchKey()) {
+			newSubtree = insertItem(tNode.leftCircle, newCircle);
+			tNode.leftCircle = newSubtree;
+			return tNode;
+		}
+		
+		newSubtree = insertItem(tNode.rightCircle, newCircle);
+		tNode.rightCircle = newSubtree;
+		return tNode;
+	}
+	
+	/**
+	 * Retrieves a circle from the tree.
+	 *
+	 * @param searchKey a unique identifying value
+	 */
+	public void retrieveItem( Integer searchKey) {
+		retrieveItem(root, searchKey);
+	}
+	
+	
+	/**
+	 * Searches for a circle from the tree.
+	 * @param tNode a tree node 
+	 * @param searchKey a unique identifying value
+	 * @return An integer search key number
+	 */
+    private Integer retrieveItem( TreeNode tNode, Integer searchKey ) {
+		Integer treeItem;
+		if (tNode == null) {
+			treeItem = null;
+
+		} else {
+			tNode.highlightFlag = true;
+			Circle nodeItem = tNode.rootCircle;
+			if (Objects.equals(searchKey, nodeItem.getSearchKey())) {
+                treeItem = tNode.rootCircle.getSearchKey();
+			} else if (searchKey < nodeItem.getSearchKey()) {
+				tNode.leftCircle.highlightFlag = true;
+				treeItem = retrieveItem(tNode.leftCircle, searchKey);
+			} else {
+				tNode.rightCircle.highlightFlag = true;
+				treeItem = retrieveItem(tNode.rightCircle, searchKey);
+			}
+		}
+
+		return treeItem;
+	}
+	
+	/**
+	 * Deletes a circle from the tree.
+	 * @param searchKey a unique identifying value
+	 * @throws TreeException if a search key cannot be located.
+	 */
+	public void deleteItem(Integer searchKey) throws TreeException {
+		root = deleteItem(root, searchKey);
+	}
+	
+	/**
+	 * Deletes a circle from the tree.
+	 * @param tNode a tree node 
+	 * @param searchKey a unique identifying value
+	 * @return A tree.TreeNode from within the tree
+	 */
+    private TreeNode deleteItem( TreeNode tNode, Integer searchKey ) {
+		TreeNode newSubtree;
+		
+		if (tNode == null) {
+			throw new TreeException("tree.TreeException: Item not found");
+		}
+		
+		Circle nodeItem = tNode.rootCircle;
+		if (Objects.equals(searchKey, nodeItem.getSearchKey())) {
+			tNode = deleteNode(tNode);
+
+		} else if (searchKey < nodeItem.getSearchKey()) {
+			newSubtree = deleteItem(tNode.leftCircle, searchKey);
+			tNode.leftCircle = newSubtree;
+		}
+
+		else {
+			newSubtree = deleteItem(tNode.rightCircle, searchKey);
+			tNode.rightCircle = newSubtree;
+		}
+
+		return tNode;
+	}
+	
+	/**
+	 * Helper method finds and replaces a deleted node. 
+	 * @param tNode A tree.TreeNode from within the tree
+	 * @return A tree.TreeNode from within the tree
+	 */
+    private TreeNode deleteNode( TreeNode tNode ) {
+
+		Circle replacementItem;
+
+		if ((tNode.leftCircle == null) && (tNode.rightCircle == null)) {
+			return null;
+		}
+
+		else if (tNode.leftCircle == null) {
+			return tNode.rightCircle;
+		}
+
+		else if (tNode.rightCircle == null) {
+			return tNode.leftCircle;
+		} else {
+
+			replacementItem = findLeftmost(tNode.rightCircle);
+			tNode.rootCircle = replacementItem;
+			tNode.rightCircle = deleteLeftmost(tNode.rightCircle);
+			return tNode;
+		}
+	}
+
+	/**
+	 * Helper method for searching and deleting left-side nodes.
+	 * @param tNode A tree.TreeNode from within the tree
+	 * @return A tree.TreeNode from within the tree
+	 */
+    private Circle findLeftmost( TreeNode tNode ) {
+		if (tNode.leftCircle == null) {
+			return tNode.rootCircle;
+		}
+		return findLeftmost(tNode.leftCircle);
+	}
+	
+	/**
+	 * Helper method for searching and deleting right-side nodes.
+	 * @param tNode A tree.TreeNode from within the tree
+	 * @return A tree.TreeNode from within the tree
+	 */
+    private TreeNode deleteLeftmost( TreeNode tNode ) {
+		if (tNode.leftCircle == null) {
+			return tNode.rightCircle;
+		}
+		tNode.leftCircle = deleteLeftmost(tNode.leftCircle);
+		return tNode;
+	}
+	
+	/**
+	 * Resets the color to the default.
+	 * @param tNode A node in the tree
+	 */
+	public void setResetColor(TreeNode tNode) {
+		 resetColor(tNode);
+	}
+	
+	
+	/**
+	 * Resets the color to the default.
+	 * @param tNode A node in the tree
+	 */
+    private void resetColor( TreeNode tNode ) {
+		if (tNode != null) {
+			tNode.highlightFlag = false;
+
+			if (tNode.leftCircle != null) {
+				tNode.leftCircle.highlightFlag = false;
+			}
+
+			if (tNode.rightCircle != null) {
+				tNode.rightCircle.highlightFlag = false;
+			}
+			resetColor(tNode.leftCircle);
+			resetColor(tNode.rightCircle);
+		}
+	}
+
+	/**
+	 * Gets the height of the tree
+	 * @param root A tree.TreeNode from within the tree
+	 * @return An integer representing the height of the tree
+	 */
+	public int getHeight(TreeNode root) {
+		if (root == null)
+			return 0;
+		return Math.max(getHeight(root.leftCircle), getHeight(root.rightCircle)) + 1;
+	}
+	
+	/**
+	 * Gets the size of the tree
+	 * @param root A tree.TreeNode from within the tree
+	 * @return An integer representing the size of the tree
+	 */
+	@SuppressWarnings("unused")
+	public int getSize(TreeNode root) {
+		if (root == null)
+			return 0;
+		return (getSize(root.leftCircle) + getSize(root.rightCircle)) + 1;
+	}
+
+}
diff --git a/src/main/java/tree/BinaryTreeBasis.java b/src/main/java/com/ericcanull/fxbinarytree/tree/BinaryTreeBasis.java
similarity index 69%
rename from src/main/java/tree/BinaryTreeBasis.java
rename to src/main/java/com/ericcanull/fxbinarytree/tree/BinaryTreeBasis.java
index 39e4e34..946af68 100644
--- a/src/main/java/tree/BinaryTreeBasis.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/tree/BinaryTreeBasis.java
@@ -1,66 +1,58 @@
-package tree;
-
-import shape.Circle;
-
-/**
- * An abstract base class for a binary tree.
- * @author Eric Canull
- */
-public abstract class BinaryTreeBasis {
-
-	/**
-	 * Inherited by the concrete BST class.
-	 */
-	public TreeNode root;
-	
-	/**
-	 * An abstract base class for the BST.
-	 */
-	public BinaryTreeBasis() {
-		root = null;
-	}
-	
-	/**
-	 * An abstract base class for the BST.
-	 * @param rootCircle
-	 * @Overload Default constructor
-	 */
-	public BinaryTreeBasis(Circle rootCircle) {
-		root = new TreeNode(rootCircle, null, null);
-	}
-	
-	/**
-	 * Checks if the tree is empty.
-	 * @return <code>true</code> if the tree has items
-	 */
-	public boolean isEmpty() {
-		return root == null;
-	}
-	
-	/**
-	 * Makes the tree empty.
-	 */
-	public void makeEmpty() {
-		root = null;
-	}
-
-	/**
-	 * Gets the root item.
-	 * @return A shape.Circle object representing the tree root
-	 * @throws TreeException
-	 */
-	public TreeNode getRoot() throws TreeException {
-		if (root == null) {
-			throw new TreeException("tree.TreeException: Empty Tree");
-		}
-		
-		return root;
-	}
-	
-	/**
-	 * Sets the root item. 
-	 * @param newCircle a shape.Circle object with a tree search key
-	 */
-	public abstract void setRootItem(Circle newCircle);
-
+package com.ericcanull.fxbinarytree.tree;
+
+import com.ericcanull.fxbinarytree.shape.Circle;
+
+/**
+ * An abstract base class for a binary tree.
+ * @author Eric Canull
+ */
+public abstract class BinaryTreeBasis {
+
+	/**
+	 * Inherited by the concrete BST class.
+	 */
+	public TreeNode root;
+	
+	/**
+	 * An abstract base class for the BST.
+	 */
+	public BinaryTreeBasis() {
+		root = null;
+	}
+	
+	/**
+	 * An abstract base class for the BST.
+	 * @param rootCircle a shape.Circle object with a tree search key
+	 */
+	public BinaryTreeBasis(Circle rootCircle) {
+		root = new TreeNode(rootCircle);
+	}
+	
+	/**
+	 * Checks if the tree is empty.
+	 * @return <code>true</code> if the tree has items
+	 */
+	public boolean isEmpty() {
+		return root == null;
+	}
+	
+	/**
+	 * Makes the tree empty.
+	 */
+	public void makeEmpty() {
+		root = null;
+	}
+
+	/**
+	 * Gets the root item.
+	 * @return A shape.Circle object representing the tree root
+	 * @throws TreeException if the tree is empty
+	 */
+	public TreeNode getRoot() throws TreeException {
+		if (root == null) {
+			throw new TreeException("tree.TreeException: Empty Tree");
+		}
+		
+		return root;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/tree/QueueException.java b/src/main/java/com/ericcanull/fxbinarytree/tree/QueueException.java
similarity index 55%
rename from src/main/java/tree/QueueException.java
rename to src/main/java/com/ericcanull/fxbinarytree/tree/QueueException.java
index ec5712c..00cbf5c 100644
--- a/src/main/java/tree/QueueException.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/tree/QueueException.java
@@ -1,16 +1,15 @@
-package tree;
-
-/**
- * Defines an exception that is thrown when a queue exception occurs.
- */
-@SuppressWarnings("serial")
-public final class QueueException extends RuntimeException {
-
-	/**
-	 * Constructs an object with specific message
-	 * @param message A string literal specifying the details of this exception
-	 */
-	public QueueException(String message) {
-		super(message);
-	}
-}
+package com.ericcanull.fxbinarytree.tree;
+
+/**
+ * Defines an exception (thrown when a queue exception occurs).
+ */
+public final class QueueException extends RuntimeException {
+
+	/**
+	 * Constructs an object with a specific message
+	 * @param message A string literal specifying the details of this exception
+	 */
+	public QueueException(String message) {
+		super(message);
+	}
+}
diff --git a/src/main/java/tree/TreeException.java b/src/main/java/com/ericcanull/fxbinarytree/tree/TreeException.java
similarity index 56%
rename from src/main/java/tree/TreeException.java
rename to src/main/java/com/ericcanull/fxbinarytree/tree/TreeException.java
index c90e259..dff348d 100644
--- a/src/main/java/tree/TreeException.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/tree/TreeException.java
@@ -1,16 +1,15 @@
-package tree;
-
-/**
- * Defines an exception that is thrown when tree exception occurs.
- */
-@SuppressWarnings("serial")
-public final class TreeException extends RuntimeException {
-	
-	/**
-	 * Constructs an object with specific message
-	 * @param message A string literal specifying the details of this exception
-	 */
-	public TreeException(String message) {
-		super(message);
-	}
-}
+package com.ericcanull.fxbinarytree.tree;
+
+/**
+ * Defines an exception (thrown when a tree exception occurs).
+ */
+public final class TreeException extends RuntimeException {
+	
+	/**
+	 * Constructs an object with a specific message
+	 * @param message A string literal specifying the details of this exception
+	 */
+	public TreeException(String message) {
+		super(message);
+	}
+}
diff --git a/src/main/java/tree/TreeIterator.java b/src/main/java/com/ericcanull/fxbinarytree/tree/TreeIterator.java
similarity index 90%
rename from src/main/java/tree/TreeIterator.java
rename to src/main/java/com/ericcanull/fxbinarytree/tree/TreeIterator.java
index 0b20f52..eacee53 100644
--- a/src/main/java/tree/TreeIterator.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/tree/TreeIterator.java
@@ -1,115 +1,115 @@
-package tree;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-
-/**
- * Iterates through the tree using the java.util.Iterator<E> interface.
- * @author Eric Canull
- * @version 1.0
- */
-public final class TreeIterator implements Iterator<Integer> {
-	
-	private BinaryTreeBasis binaryTree;
-	private TreeNode currentNode;
-	private LinkedList<TreeNode> queue;
-	
-	/**
-	 * Iterates through the tree using the java.util.Iterator<E> interface.
-	 * @param binaryTree the abstract binary tree class
-	 */
-	public TreeIterator(BinaryTreeBasis binaryTree) {
-		this.binaryTree = binaryTree;
-		currentNode = null;
-		queue = new LinkedList<>();
-	}
-	
-	/**
-	 * Determines if there are elements in the queue. 
-	 * @Return true if the iteration has more elements
-	 */
-	public boolean hasNext() {
-		return !queue.isEmpty();
-	}
-	
-	/**
-	 * Gets the next element in the queue.
-	 * @return An <code>Integer</code> numbered search key.
-	 */
-	public Integer next() throws NoSuchElementException {
-		try {
-			currentNode = queue.remove();
-			return currentNode.rootCircle.getSearchKey();
-		} catch (QueueException e) {
-			throw new NoSuchElementException();
-		}
-	}
-	
-	/**
-	 * Unsupported remove operation. Throws an exception when invoked.
-	 */
-	public void remove() throws UnsupportedOperationException {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Sets the tree traversal to in-order
-	 */
-	public void setPreorder() {
-		queue.clear();
-		preorder(binaryTree.root);
-	}
-	
-	/**
-	 * Recursively traverses the tree in-order
-	 * @param treeNode A tree with nodes
-	 */
-	private void preorder(TreeNode treeNode) {
-		if (treeNode != null) {
-			queue.add(treeNode);
-			preorder(treeNode.leftCircle);
-			preorder(treeNode.rightCircle);
-		}
-	}
-	
-	/**
-	 * Sets the tree traversal to in-order
-	 */
-	public void setInorder() {
-		queue.clear();
-		inorder(binaryTree.root);
-	}
-	
-	/**
-	 * Recursively traverses the tree in-order
-	 * @param treeNode A tree with nodes
-	 */
-	private void inorder(TreeNode treeNode) {
-		if (treeNode != null) {
-			inorder(treeNode.leftCircle);
-			queue.add(treeNode);
-			inorder(treeNode.rightCircle);
-		}
-	}
-	
-	/**
-	 * Sets the tree to traverse in post-order
-	 */
-	public void setPostorder() {
-		queue.clear();
-		postorder(binaryTree.root);
-	}
-	
-	/**
-	 * Recursively traverses the tree post-order
-	 * @param treeNode A tree with nodes
-	 */
-	private void postorder(TreeNode treeNode) {
-		if (treeNode != null) {
-			postorder(treeNode.leftCircle);
-			postorder(treeNode.rightCircle);
-			queue.add(treeNode);
-		}
-	}
+package com.ericcanull.fxbinarytree.tree;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+
+/**
+ * Iterates through the tree using the java.util.Iterator<E> interface.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public final class TreeIterator implements Iterator<Integer> {
+	
+	private final BinaryTreeBasis binaryTree;
+	private TreeNode currentNode;
+	private final LinkedList<TreeNode> queue;
+	
+	/**
+	 * Iterates through the tree using the java.util.Iterator<E> interface.
+	 * @param binaryTree the abstract binary tree class
+	 */
+	public TreeIterator(BinaryTreeBasis binaryTree) {
+		this.binaryTree = binaryTree;
+		currentNode = null;
+		queue = new LinkedList<>();
+	}
+	
+	/**
+	 * Determines if there are elements in the queue. 
+	 * @return true if the iteration has more elements
+	 */
+	public boolean hasNext() {
+		return !queue.isEmpty();
+	}
+	
+	/**
+	 * Gets the next element in the queue.
+	 * @return An <code>Integer</code> numbered search key.
+	 */
+	public Integer next() throws NoSuchElementException {
+		try {
+			currentNode = queue.remove();
+			return currentNode.rootCircle.getSearchKey();
+		} catch (QueueException e) {
+			throw new NoSuchElementException();
+		}
+	}
+	
+	/**
+	 * Unsupported remove operation. Throws an exception when invoked.
+	 */
+	public void remove() throws UnsupportedOperationException {
+		throw new UnsupportedOperationException();
+	}
+	
+	/**
+	 * Sets the tree traversal to in-order
+	 */
+	public void setPreorder() {
+		queue.clear();
+		preorder(binaryTree.root);
+	}
+	
+	/**
+	 * Recursively traverses the tree in-order
+	 * @param treeNode A tree with nodes
+	 */
+	private void preorder(TreeNode treeNode) {
+		if (treeNode != null) {
+			queue.add(treeNode);
+			preorder(treeNode.leftCircle);
+			preorder(treeNode.rightCircle);
+		}
+	}
+	
+	/**
+	 * Sets the tree traversal to in-order
+	 */
+	public void setInorder() {
+		queue.clear();
+		inorder(binaryTree.root);
+	}
+	
+	/**
+	 * Recursively traverses the tree in-order
+	 * @param treeNode A tree with nodes
+	 */
+	private void inorder(TreeNode treeNode) {
+		if (treeNode != null) {
+			inorder(treeNode.leftCircle);
+			queue.add(treeNode);
+			inorder(treeNode.rightCircle);
+		}
+	}
+	
+	/**
+	 * Sets the tree to traverse in post-order
+	 */
+	public void setPostorder() {
+		queue.clear();
+		postorder(binaryTree.root);
+	}
+	
+	/**
+	 * Recursively traverses the tree post-order
+	 * @param treeNode A tree with nodes
+	 */
+	private void postorder(TreeNode treeNode) {
+		if (treeNode != null) {
+			postorder(treeNode.leftCircle);
+			postorder(treeNode.rightCircle);
+			queue.add(treeNode);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/tree/TreeNode.java b/src/main/java/com/ericcanull/fxbinarytree/tree/TreeNode.java
similarity index 64%
rename from src/main/java/tree/TreeNode.java
rename to src/main/java/com/ericcanull/fxbinarytree/tree/TreeNode.java
index 1253bf7..4f55211 100644
--- a/src/main/java/tree/TreeNode.java
+++ b/src/main/java/com/ericcanull/fxbinarytree/tree/TreeNode.java
@@ -1,29 +1,27 @@
-package tree;
-
-import shape.Circle;
-
-/**
- * A binary tree using circle objects.
- * @author Eric Canull
- * @version 1.0
- */
-public class TreeNode {
-	
-	public Circle rootCircle;
-	public TreeNode leftCircle;
-	public TreeNode rightCircle;
-	public boolean highlightFlag;
-	
-	/**
-	 * A binary tree using circle objects.
-	 * @param rootCircle a root tree circle
-	 * @param leftCircle a left tree circle
-	 * @param rightCircle a right tree circle
-	 */
-	public TreeNode(Circle rootCircle, TreeNode leftCircle, TreeNode rightCircle) {
-		this.rootCircle = rootCircle;
-		this.leftCircle = null;
-		this.rightCircle = null;
-	}
-
-}
+package com.ericcanull.fxbinarytree.tree;
+
+import com.ericcanull.fxbinarytree.shape.Circle;
+
+/**
+ * A binary tree using circle objects.
+ * @author Eric Canull
+ * @version 1.0
+ */
+public class TreeNode {
+	
+	public Circle rootCircle;
+	public TreeNode leftCircle;
+	public TreeNode rightCircle;
+	public boolean highlightFlag;
+	
+	/**
+	 * A binary tree using circle objects.
+	 * @param rootCircle a root tree circle
+	 */
+	public TreeNode( Circle rootCircle ) {
+		this.rootCircle = rootCircle;
+		this.leftCircle = null;
+		this.rightCircle = null;
+	}
+
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..05d9d0d
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+module com.ericcanull.fxbinarytree {
+    requires javafx.controls;
+    requires javafx.fxml;
+
+    // Export the package that has your controller classes to JavaFX
+    exports com.ericcanull.fxbinarytree.controller to javafx.fxml;
+
+    // Open the package that has your Main and controller classes
+    opens com.ericcanull.fxbinarytree.app;
+    opens com.ericcanull.fxbinarytree.controller;
+
+    exports com.ericcanull.fxbinarytree.app to javafx.graphics;
+}
\ No newline at end of file
diff --git a/src/main/resources/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml b/src/main/resources/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml
new file mode 100644
index 0000000..574d5e1
--- /dev/null
+++ b/src/main/resources/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<BorderPane fx:id="root_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="900.0" stylesheets="@../style/graphics_controller.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.ericcanull.fxbinarytree.controller.GraphicsController">
+   <bottom>
+      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
+         <padding>
+            <Insets bottom="3.0"/>
+         </padding>
+         <TextField fx:id="input_field" prefColumnCount="6" prefHeight="25.0" promptText="Key"/>
+         <Button layoutX="227.0" layoutY="10.0" mnemonicParsing="false" onAction="#insertOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Insert"/>
+         <Button mnemonicParsing="false" onAction="#searchOnAction" prefHeight="35.0" prefWidth="90.0"
+                  text="Search"/>
+         <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#deleteOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Delete"/>
+         <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#clearOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Clear"/>
+         <Button layoutX="211.0" layoutY="10.0" mnemonicParsing="false" onAction="#inorderOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Inorder"/>
+         <Button layoutX="169.0" layoutY="10.0" mnemonicParsing="false" onAction="#preorderOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Preorder"/>
+         <Button layoutX="151.0" layoutY="10.0" mnemonicParsing="false" onAction="#postorderOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Postorder"/>
+      </HBox>
+   </bottom>
+   <top>
+      <GridPane alignment="CENTER_LEFT">
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="25.0" vgrow="NEVER"/>
+         </rowConstraints>
+         <AnchorPane GridPane.hgrow="ALWAYS" GridPane.valignment="CENTER" GridPane.vgrow="NEVER">
+            <TextArea fx:id="traversal_textarea" editable="false" maxHeight="-Infinity"
+                      maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="20.0" prefRowCount="1"
+                      AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+                      AnchorPane.topAnchor="0.0"/>
+         </AnchorPane>
+      </GridPane>
+   </top>
+</BorderPane>
diff --git a/src/main/resources/image/binarytree_screenshot.png b/src/main/resources/com/ericcanull/fxbinarytree/image/binarytree_screenshot.png
similarity index 100%
rename from src/main/resources/image/binarytree_screenshot.png
rename to src/main/resources/com/ericcanull/fxbinarytree/image/binarytree_screenshot.png
diff --git a/src/main/resources/style/graphics_controller.css b/src/main/resources/com/ericcanull/fxbinarytree/style/graphics_controller.css
similarity index 99%
rename from src/main/resources/style/graphics_controller.css
rename to src/main/resources/com/ericcanull/fxbinarytree/style/graphics_controller.css
index aaf4271..c6c81fa 100644
--- a/src/main/resources/style/graphics_controller.css
+++ b/src/main/resources/com/ericcanull/fxbinarytree/style/graphics_controller.css
@@ -1,3 +1,4 @@
+/*noinspection ALL*/
 .root {
     -fx-font-family: "System";
     -fx-font-size: 1em;
diff --git a/src/main/resources/fxml/FXMLGraphicsPanel.fxml b/src/main/resources/fxml/FXMLGraphicsPanel.fxml
deleted file mode 100644
index 8e2025c..0000000
--- a/src/main/resources/fxml/FXMLGraphicsPanel.fxml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
-<BorderPane fx:id="root_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="900.0" stylesheets="@../style/graphics_controller.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controller.GraphicsController">
-   <bottom>
-      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
-         <children>
-            <TextField fx:id="input_field" prefColumnCount="6" prefHeight="25.0" promptText="Key" />
-            <Button layoutX="227.0" layoutY="10.0" mnemonicParsing="false" onAction="#insertOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Insert" />
-            <Button mnemonicParsing="false" onAction="#searchOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Search" />
-            <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#deleteOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Delete" />
-            <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#clearOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Clear" />
-            <Button layoutX="211.0" layoutY="10.0" mnemonicParsing="false" onAction="#inorderOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Inorder" />
-            <Button layoutX="169.0" layoutY="10.0" mnemonicParsing="false" onAction="#preorderOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Preorder" />
-            <Button layoutX="151.0" layoutY="10.0" mnemonicParsing="false" onAction="#postorderOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Postorder" />
-         </children>
-         <padding>
-            <Insets bottom="3.0" />
-         </padding></HBox>
-   </bottom>
-   <top>
-      <GridPane alignment="CENTER_LEFT">
-         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-         </columnConstraints>
-         <rowConstraints>
-            <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="25.0" vgrow="NEVER" />
-         </rowConstraints>
-         <children>
-            <AnchorPane GridPane.hgrow="ALWAYS" GridPane.valignment="CENTER" GridPane.vgrow="NEVER">
-               <children>
-                  <TextArea fx:id="traversal_textarea" editable="false" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="20.0" prefRowCount="1" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-               </children>
-            </AnchorPane>
-         </children>
-      </GridPane>
-   </top>
-</BorderPane>
diff --git a/target/classes/app/Main.class b/target/classes/app/Main.class
deleted file mode 100644
index 2abf68b..0000000
Binary files a/target/classes/app/Main.class and /dev/null differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/app/Main.class b/target/classes/com/ericcanull/fxbinarytree/app/Main.class
new file mode 100644
index 0000000..24c8733
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/app/Main.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/controller/GraphicsController.class b/target/classes/com/ericcanull/fxbinarytree/controller/GraphicsController.class
new file mode 100644
index 0000000..08d2d0c
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/controller/GraphicsController.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/controller/GraphicsTree.class b/target/classes/com/ericcanull/fxbinarytree/controller/GraphicsTree.class
new file mode 100644
index 0000000..da699ee
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/controller/GraphicsTree.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml b/target/classes/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml
new file mode 100644
index 0000000..574d5e1
--- /dev/null
+++ b/target/classes/com/ericcanull/fxbinarytree/fxml/FXMLGraphicsPanel.fxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<BorderPane fx:id="root_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="900.0" stylesheets="@../style/graphics_controller.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.ericcanull.fxbinarytree.controller.GraphicsController">
+   <bottom>
+      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
+         <padding>
+            <Insets bottom="3.0"/>
+         </padding>
+         <TextField fx:id="input_field" prefColumnCount="6" prefHeight="25.0" promptText="Key"/>
+         <Button layoutX="227.0" layoutY="10.0" mnemonicParsing="false" onAction="#insertOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Insert"/>
+         <Button mnemonicParsing="false" onAction="#searchOnAction" prefHeight="35.0" prefWidth="90.0"
+                  text="Search"/>
+         <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#deleteOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Delete"/>
+         <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#clearOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Clear"/>
+         <Button layoutX="211.0" layoutY="10.0" mnemonicParsing="false" onAction="#inorderOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Inorder"/>
+         <Button layoutX="169.0" layoutY="10.0" mnemonicParsing="false" onAction="#preorderOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Preorder"/>
+         <Button layoutX="151.0" layoutY="10.0" mnemonicParsing="false" onAction="#postorderOnAction" prefHeight="35.0"
+                 prefWidth="90.0"  text="Postorder"/>
+      </HBox>
+   </bottom>
+   <top>
+      <GridPane alignment="CENTER_LEFT">
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="25.0" vgrow="NEVER"/>
+         </rowConstraints>
+         <AnchorPane GridPane.hgrow="ALWAYS" GridPane.valignment="CENTER" GridPane.vgrow="NEVER">
+            <TextArea fx:id="traversal_textarea" editable="false" maxHeight="-Infinity"
+                      maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="20.0" prefRowCount="1"
+                      AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+                      AnchorPane.topAnchor="0.0"/>
+         </AnchorPane>
+      </GridPane>
+   </top>
+</BorderPane>
diff --git a/target/classes/com/ericcanull/fxbinarytree/image/binarytree_screenshot.png b/target/classes/com/ericcanull/fxbinarytree/image/binarytree_screenshot.png
new file mode 100644
index 0000000..be58570
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/image/binarytree_screenshot.png differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/shape/Circle.class b/target/classes/com/ericcanull/fxbinarytree/shape/Circle.class
new file mode 100644
index 0000000..242c3de
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/shape/Circle.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/shape/Line.class b/target/classes/com/ericcanull/fxbinarytree/shape/Line.class
new file mode 100644
index 0000000..754dabb
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/shape/Line.class differ
diff --git a/target/classes/style/graphics_controller.css b/target/classes/com/ericcanull/fxbinarytree/style/graphics_controller.css
similarity index 99%
rename from target/classes/style/graphics_controller.css
rename to target/classes/com/ericcanull/fxbinarytree/style/graphics_controller.css
index aaf4271..c6c81fa 100644
--- a/target/classes/style/graphics_controller.css
+++ b/target/classes/com/ericcanull/fxbinarytree/style/graphics_controller.css
@@ -1,3 +1,4 @@
+/*noinspection ALL*/
 .root {
     -fx-font-family: "System";
     -fx-font-size: 1em;
diff --git a/target/classes/com/ericcanull/fxbinarytree/tree/BinarySearchTree.class b/target/classes/com/ericcanull/fxbinarytree/tree/BinarySearchTree.class
new file mode 100644
index 0000000..346f7de
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/tree/BinarySearchTree.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/tree/BinaryTreeBasis.class b/target/classes/com/ericcanull/fxbinarytree/tree/BinaryTreeBasis.class
new file mode 100644
index 0000000..78e6b7d
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/tree/BinaryTreeBasis.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/tree/QueueException.class b/target/classes/com/ericcanull/fxbinarytree/tree/QueueException.class
new file mode 100644
index 0000000..1a3eca8
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/tree/QueueException.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/tree/TreeException.class b/target/classes/com/ericcanull/fxbinarytree/tree/TreeException.class
new file mode 100644
index 0000000..71272d5
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/tree/TreeException.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/tree/TreeIterator.class b/target/classes/com/ericcanull/fxbinarytree/tree/TreeIterator.class
new file mode 100644
index 0000000..85b4f25
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/tree/TreeIterator.class differ
diff --git a/target/classes/com/ericcanull/fxbinarytree/tree/TreeNode.class b/target/classes/com/ericcanull/fxbinarytree/tree/TreeNode.class
new file mode 100644
index 0000000..12f0c64
Binary files /dev/null and b/target/classes/com/ericcanull/fxbinarytree/tree/TreeNode.class differ
diff --git a/target/classes/controller/GraphicsController.class b/target/classes/controller/GraphicsController.class
deleted file mode 100644
index bcd14bc..0000000
Binary files a/target/classes/controller/GraphicsController.class and /dev/null differ
diff --git a/target/classes/controller/GraphicsTree.class b/target/classes/controller/GraphicsTree.class
deleted file mode 100644
index 00eb039..0000000
Binary files a/target/classes/controller/GraphicsTree.class and /dev/null differ
diff --git a/target/classes/fxml/FXMLGraphicsPanel.fxml b/target/classes/fxml/FXMLGraphicsPanel.fxml
deleted file mode 100644
index 8e2025c..0000000
--- a/target/classes/fxml/FXMLGraphicsPanel.fxml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-
-<BorderPane fx:id="root_container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="900.0" stylesheets="@../style/graphics_controller.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controller.GraphicsController">
-   <bottom>
-      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
-         <children>
-            <TextField fx:id="input_field" prefColumnCount="6" prefHeight="25.0" promptText="Key" />
-            <Button layoutX="227.0" layoutY="10.0" mnemonicParsing="false" onAction="#insertOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Insert" />
-            <Button mnemonicParsing="false" onAction="#searchOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Search" />
-            <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#deleteOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Delete" />
-            <Button layoutX="217.0" layoutY="10.0" mnemonicParsing="false" onAction="#clearOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Clear" />
-            <Button layoutX="211.0" layoutY="10.0" mnemonicParsing="false" onAction="#inorderOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Inorder" />
-            <Button layoutX="169.0" layoutY="10.0" mnemonicParsing="false" onAction="#preorderOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Preorder" />
-            <Button layoutX="151.0" layoutY="10.0" mnemonicParsing="false" onAction="#postorderOnAction" prefHeight="35.0" prefWidth="90.0" styleClass="control-button" text="Postorder" />
-         </children>
-         <padding>
-            <Insets bottom="3.0" />
-         </padding></HBox>
-   </bottom>
-   <top>
-      <GridPane alignment="CENTER_LEFT">
-         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-         </columnConstraints>
-         <rowConstraints>
-            <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="25.0" vgrow="NEVER" />
-         </rowConstraints>
-         <children>
-            <AnchorPane GridPane.hgrow="ALWAYS" GridPane.valignment="CENTER" GridPane.vgrow="NEVER">
-               <children>
-                  <TextArea fx:id="traversal_textarea" editable="false" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="20.0" prefRowCount="1" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-               </children>
-            </AnchorPane>
-         </children>
-      </GridPane>
-   </top>
-</BorderPane>
diff --git a/target/classes/module-info.class b/target/classes/module-info.class
new file mode 100644
index 0000000..11fdb3c
Binary files /dev/null and b/target/classes/module-info.class differ
diff --git a/target/classes/shape/Circle.class b/target/classes/shape/Circle.class
deleted file mode 100644
index f33f7fa..0000000
Binary files a/target/classes/shape/Circle.class and /dev/null differ
diff --git a/target/classes/shape/Line.class b/target/classes/shape/Line.class
deleted file mode 100644
index 063fe60..0000000
Binary files a/target/classes/shape/Line.class and /dev/null differ
diff --git a/target/classes/tree/BinarySearchTree.class b/target/classes/tree/BinarySearchTree.class
deleted file mode 100644
index 745c5fc..0000000
Binary files a/target/classes/tree/BinarySearchTree.class and /dev/null differ
diff --git a/target/classes/tree/BinaryTreeBasis.class b/target/classes/tree/BinaryTreeBasis.class
deleted file mode 100644
index 96b94f7..0000000
Binary files a/target/classes/tree/BinaryTreeBasis.class and /dev/null differ
diff --git a/target/classes/tree/QueueException.class b/target/classes/tree/QueueException.class
deleted file mode 100644
index 91d4795..0000000
Binary files a/target/classes/tree/QueueException.class and /dev/null differ
diff --git a/target/classes/tree/TreeException.class b/target/classes/tree/TreeException.class
deleted file mode 100644
index 5720d48..0000000
Binary files a/target/classes/tree/TreeException.class and /dev/null differ
diff --git a/target/classes/tree/TreeIterator.class b/target/classes/tree/TreeIterator.class
deleted file mode 100644
index 2d9ccf4..0000000
Binary files a/target/classes/tree/TreeIterator.class and /dev/null differ
diff --git a/target/classes/tree/TreeNode.class b/target/classes/tree/TreeNode.class
deleted file mode 100644
index 3ca1b43..0000000
Binary files a/target/classes/tree/TreeNode.class and /dev/null differ