diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2fbce8d..b304fe3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,28 @@
   <component name="ChangeListManager">
     <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Fixed a bunch of errors where">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/BankGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/BankGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/BankText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/BankText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FileSaving.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/FileSaving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/FileSaving.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GameEndGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/GameEndGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/LoanSharkGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/LoanSharkGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/MainGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/MainGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/Player.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/PlayerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/tests/PlayerTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/RandomEventGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/RandomEventGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/ShipWarfareGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ShipWarfareLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/ShipWarfareLogic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ShipWarfareText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/ShipWarfareText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/StartGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/StartGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/TaipanShopGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShopLogic.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/logic/TaipanShopLogic.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaipanShopText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/TaipanShopText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/TravelGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TravelText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/TravelText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/WarehouseGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/gui/WarehouseGUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/WarehouseText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/WarehouseText.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/loanSharkText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/text/loanSharkText.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,34 +34,21 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfareLogic.java">
+        <entry file="file://$PROJECT_DIR$/src/gui/ShipWarfareGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+            <state relative-caret-position="357">
+              <caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="70" column="26" selection-start-line="70" selection-start-column="26" selection-end-line="70" selection-end-column="26" />
+            <state relative-caret-position="969">
+              <caret line="83" column="56" lean-forward="true" selection-start-line="83" selection-start-column="56" selection-end-line="83" selection-end-column="56" />
               <folding>
                 <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="624">
-              <caret line="104" column="17" lean-forward="true" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="imports" expanded="true" />
                 <element signature="method#shipStatusString#0;class#TravelGUI#0" />
               </folding>
             </state>
@@ -48,43 +56,79 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+        <entry file="file://$PROJECT_DIR$/src/text/BankText.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7175">
-              <caret line="720" lean-forward="true" selection-start-line="720" selection-end-line="720" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-              </folding>
+            <state relative-caret-position="68">
+              <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/TaipanShopLogic.java">
+        <entry file="file://$PROJECT_DIR$/src/text/loanSharkText.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="23" column="56" selection-start-line="23" selection-start-column="56" selection-end-line="23" selection-end-column="56" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-              </folding>
+            <state relative-caret-position="68">
+              <caret line="4" column="38" lean-forward="true" selection-start-line="4" selection-start-column="38" selection-end-line="4" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/TravelText.java">
+        <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+            <state relative-caret-position="238">
+              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfareText.java">
+        <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="544">
-              <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
+            <state relative-caret-position="595">
+              <caret line="35" column="25" lean-forward="true" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="68">
+              <caret line="4" column="38" lean-forward="true" selection-start-line="4" selection-start-column="38" selection-end-line="4" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/gui/StartGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3808">
+              <caret line="224" column="26" selection-start-line="224" selection-start-column="26" selection-end-line="224" selection-end-column="26" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="527">
+              <caret line="244" column="16" selection-start-line="244" selection-start-column="16" selection-end-line="244" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -107,7 +151,9 @@
       <find>stage</find>
       <find>defaultTextOut</find>
       <find>player</find>
+      <find>printLn</find>
       <find>WarehouseText</find>
+      <find>Sha</find>
     </findStrings>
     <replaceStrings>
       <replace>player</replace>
@@ -126,16 +172,31 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/TravelText.java" />
         <option value="$PROJECT_DIR$/src/WarehouseText.java" />
         <option value="$PROJECT_DIR$/src/BankText.java" />
         <option value="$PROJECT_DIR$/src/loanSharkText.java" />
-        <option value="$PROJECT_DIR$/src/text/BankText.java" />
-        <option value="$PROJECT_DIR$/src/TaipanShopText.java" />
         <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfareText.java" />
         <option value="$PROJECT_DIR$/src/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/TravelText.java" />
+        <option value="$PROJECT_DIR$/src/TaipanShopText.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfareText.java" />
+        <option value="$PROJECT_DIR$/src/text/TravelText.java" />
+        <option value="$PROJECT_DIR$/src/tests/PlayerTest.java" />
+        <option value="$PROJECT_DIR$/src/gui/BankGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/GameEndGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/WarehouseGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/LoanSharkGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/RandomEventGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/StartGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/TaipanShopGUI.java" />
+        <option value="$PROJECT_DIR$/src/gui/ShipWarfareGUI.java" />
+        <option value="$PROJECT_DIR$/src/text/BankText.java" />
+        <option value="$PROJECT_DIR$/src/text/loanSharkText.java" />
+        <option value="$PROJECT_DIR$/src/text/ShipWarfareText.java" />
+        <option value="$PROJECT_DIR$/src/text/WarehouseText.java" />
+        <option value="$PROJECT_DIR$/src/text/TaipanShopText.java" />
       </list>
     </option>
   </component>
@@ -164,6 +225,42 @@
               <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="gui" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="images" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="logic" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="saves" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="TaipanClone2" type="b2602c69:ProjectViewProjectNode" />
+              <item name="TaipanClone2" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="text" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -172,7 +269,7 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554663465257" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554669400857" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/junit-4.12.jar!/" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -199,21 +296,21 @@
   </component>
   <component name="RunManager" selected="Application.MainGUI">
     <configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="MainGUI" />
+      <option name="MAIN_CLASS_NAME" value="gui.MainGUI" />
       <module name="TaipanClone" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="ShipWarfareGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="ShipWarfareGUI" />
+      <option name="MAIN_CLASS_NAME" value="gui.ShipWarfareGUI" />
       <module name="TaipanClone" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration name="ShipWarfareText" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="ShipWarfareText" />
+      <option name="MAIN_CLASS_NAME" value="text.ShipWarfareText" />
       <module name="TaipanClone" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -242,8 +339,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.MainGUI" />
         <item itemvalue="Application.ShipWarfareText" />
+        <item itemvalue="Application.MainGUI" />
         <item itemvalue="Application.ShipWarfareGUI" />
         <item itemvalue="Application.main" />
         <item itemvalue="Application.TaipanShop" />
@@ -320,12 +417,12 @@
       <option name="project" value="LOCAL" />
       <updated>1554663152314</updated>
     </task>
-    <task id="LOCAL-00004" summary="Created Player class">
-      <created>1550541406597</created>
+    <task id="LOCAL-00004" summary="Fixed the severe lack of TaipanShopText">
+      <created>1554663541186</created>
       <option name="number" value="00004" />
       <option name="presentableId" value="LOCAL-00004" />
       <option name="project" value="LOCAL" />
-      <updated>1550541406597</updated>
+      <updated>1554663541186</updated>
     </task>
     <task id="LOCAL-00005" summary="Fixed the setters to be greater than 0">
       <created>1550541751914</created>
@@ -642,11 +739,11 @@
       <option name="project" value="LOCAL" />
       <updated>1553494120570</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8326000" />
+    <option name="totallyTimeSpent" value="12883000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -682,7 +779,7 @@
       <window_info anchor="bottom" id="Database Changes" order="11" />
       <window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
       <window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
-      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.18141097" />
+      <window_info active="true" anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" visible="true" weight="0.18141097" />
       <window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -773,7 +870,6 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
-    <MESSAGE value="Fined minor bugs in shipwarfareGUI including the &quot;gun frustration&quot; variable" />
     <MESSAGE value="Just checking" />
     <MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
     <MESSAGE value="Completed SHipWarfareGUI" />
@@ -798,34 +894,18 @@
     <MESSAGE value="Fixed duplication between Shop and Travel" />
     <MESSAGE value="Updated shipwarfare text to the modern era" />
     <MESSAGE value="Finished the merger with Dedupe and the main branch.&#10;Travel and Taipan shop shouldn't have any code sharing anymore" />
-    <option name="LAST_COMMIT_MESSAGE" value="Finished the merger with Dedupe and the main branch.&#10;Travel and Taipan shop shouldn't have any code sharing anymore" />
+    <MESSAGE value="Fixed the severe lack of TaipanShopText" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed the severe lack of TaipanShopText" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/FileSaving.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/FileSaving.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-34">
           <caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/PlayerTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/WarehouseText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="31" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/gui/MainGUI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
           <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
@@ -835,83 +915,162 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/BankText.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/loanSharkText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/styleguide.css">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopText.java" />
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareLogic.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/ShipWarfareLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="187">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+          <folding>
+            <element signature="e#1218#1219#0" expanded="true" />
+            <element signature="e#1251#1252#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/logic/TaipanShopLogic.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="70" column="26" selection-start-line="70" selection-start-column="26" selection-end-line="70" selection-end-column="26" />
+        <state relative-caret-position="391">
+          <caret line="23" column="56" selection-start-line="23" selection-start-column="56" selection-end-line="23" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/TravelText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/logic/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/tests/PlayerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/gui/BankGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="624">
-          <caret line="104" column="17" lean-forward="true" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+        <state relative-caret-position="357">
+          <caret line="156" column="61" selection-start-line="156" selection-start-column="61" selection-end-line="156" selection-end-column="61" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/WarehouseGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="18" column="37" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/GameEndGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/LoanSharkGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="22" column="38" lean-forward="true" selection-start-line="22" selection-start-column="38" selection-end-line="22" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/RandomEventGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="20" column="40" lean-forward="true" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/StartGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3808">
+          <caret line="224" column="26" selection-start-line="224" selection-start-column="26" selection-end-line="224" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="244" column="16" selection-start-line="244" selection-start-column="16" selection-end-line="244" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gui/TravelGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="969">
+          <caret line="83" column="56" lean-forward="true" selection-start-line="83" selection-start-column="56" selection-end-line="83" selection-end-column="56" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
             <element signature="imports" expanded="true" />
             <element signature="method#shipStatusString#0;class#TravelGUI#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/text/BankText.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7175">
-          <caret line="720" lean-forward="true" selection-start-line="720" selection-end-line="720" />
+        <state relative-caret-position="68">
+          <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/loanSharkText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="38" lean-forward="true" selection-start-line="4" selection-start-column="38" selection-end-line="4" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/ShipWarfareText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/WarehouseText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="38" lean-forward="true" selection-start-line="4" selection-start-column="38" selection-end-line="4" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/text/TaipanShopText.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="595">
+          <caret line="35" column="25" lean-forward="true" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShopLogic.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="23" column="56" selection-start-line="23" selection-start-column="56" selection-end-line="23" selection-end-column="56" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/TravelText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareText.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/BankGUI.java b/src/gui/BankGUI.java
similarity index 57%
rename from src/BankGUI.java
rename to src/gui/BankGUI.java
index 4195662..5ef3870 100644
--- a/src/BankGUI.java
+++ b/src/gui/BankGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
@@ -10,8 +12,9 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import logic.Player;
 
-public class BankGUI extends Player{
+public class BankGUI extends Player {
     /**
      * 2019-03-10
      * Authors: Siddhant Dewani
@@ -66,7 +69,7 @@ public class BankGUI extends Player{
         hbx1.getChildren().add(b1);
         hbx1.getChildren().add(b2);
         hbx1.getChildren().add(b3);
-        hbx1.setPadding(new Insets(0,0,20,0));
+        hbx1.setPadding(new Insets(0, 0, 20, 0));
         brdr1.setBottom(hbx1);
 
         /**
@@ -87,7 +90,7 @@ public class BankGUI extends Player{
         vbx1.getChildren().add(l2);
         vbx1.getChildren().add(l4);
         vbx1.getChildren().add(l5);
-        vbx1.setPadding(new Insets(20,0,0,0));
+        vbx1.setPadding(new Insets(20, 0, 0, 0));
         brdr1.setTop(vbx1);
 
         /**
@@ -95,28 +98,25 @@ public class BankGUI extends Player{
          *
          */
         b1.setOnAction(new EventHandler<ActionEvent>() {
-                           @Override
-                           public void handle(ActionEvent event) {
-                               try {
-                                   int withdraw = Integer.parseInt(txtField1.getText());
-                                   if(withdraw < 0){
-                                       l5.setText("Come on " + getName() + ", are you trying to fool me?\nNo negative numbers please!");
-                                   }
-                                   else if (withdraw <= getBank()) {
-                                       setMoney(withdraw + getMoney());
-                                       setBank(getBank() - withdraw);
-                                   }
-                                   else {
-                                       l5.setText("Sorry, you can not withdraw that much.");
-                                   }
-                                   l2.setText("Balance: " + getBank());
-                                   l4.setText("Cash: " + getMoney());
-                               }
-                               catch (Exception e) {
-                                   l5.setText("Please enter a valid response.");
-                               }
-                           }
+               @Override
+               public void handle(ActionEvent event) {
+                   try {
+                       int withdraw = Integer.parseInt(txtField1.getText());
+                       if (withdraw < 0) {
+                           l5.setText("Come on " + getName() + ", are you trying to fool me?\nNo negative numbers please!");
+                       } else if (withdraw <= getBank()) {
+                           setMoney(withdraw + getMoney());
+                           setBank(getBank() - withdraw);
+                       } else {
+                           l5.setText("Sorry, you can not withdraw that much.");
                        }
+                       l2.setText("Balance: " + getBank());
+                       l4.setText("Cash: " + getMoney());
+                   } catch (Exception e) {
+                       l5.setText("Please enter a valid response.");
+                   }
+               }
+           }
         );
 
         /**
@@ -125,28 +125,26 @@ public class BankGUI extends Player{
          */
         // Set the event handler when the withdraw button is clicked
         b2.setOnAction(new EventHandler<ActionEvent>() {
-                           @Override
-                           public void handle(ActionEvent event) {
-                               try {
-                                   int deposit = Integer.parseInt(txtField1.getText());
-                                   if(deposit < 0){
-                                       l5.setText("Nice try! You can not enter negative numbers.");
-                                   }
-                                   else if (deposit <= getMoney()) {
-                                       setBank(deposit + getBank());
-                                       setMoney(getMoney() - deposit);
-                                   } else {
-                                       l5.setText("Sorry, you can not deposit that much.");
-                                   }
-                                   l2.setText("Balance: " + getBank());
-                                   l4.setText("Cash: " + getMoney());
-
-                               }
-                               catch (Exception e) {
-                                   l5.setText("Please enter a valid response.");
-                               }
-                           }
+               @Override
+               public void handle(ActionEvent event) {
+                   try {
+                       int deposit = Integer.parseInt(txtField1.getText());
+                       if (deposit < 0) {
+                           l5.setText("Nice try! You can not enter negative numbers.");
+                       } else if (deposit <= getMoney()) {
+                           setBank(deposit + getBank());
+                           setMoney(getMoney() - deposit);
+                       } else {
+                           l5.setText("Sorry, you can not deposit that much.");
                        }
+                       l2.setText("Balance: " + getBank());
+                       l4.setText("Cash: " + getMoney());
+
+                   } catch (Exception e) {
+                       l5.setText("Please enter a valid response.");
+                   }
+               }
+           }
         );
 
         /**
@@ -154,13 +152,13 @@ public class BankGUI extends Player{
          *
          */
         b3.setOnAction(new EventHandler<ActionEvent>() {
-                           @Override
-                           public void handle(ActionEvent event) {
-                               TaipanShopGUI shopGUI = new TaipanShopGUI(getPlayer());
-                               shopGUI.initializeShop(primaryStage);
-                               primaryStage.show();
-                           }
-                       }
+                @Override
+                public void handle(ActionEvent event) {
+                   TaipanShopGUI shopGUI = new TaipanShopGUI(getPlayer());
+                   shopGUI.initializeShop(primaryStage);
+                   primaryStage.show();
+                }
+            }
         );
 
 
diff --git a/src/GameEndGUI.java b/src/gui/GameEndGUI.java
similarity index 98%
rename from src/GameEndGUI.java
rename to src/gui/GameEndGUI.java
index 9b6770a..02c5148 100644
--- a/src/GameEndGUI.java
+++ b/src/gui/GameEndGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.geometry.Insets;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
@@ -5,6 +7,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import logic.Player;
 
 /**
 * 2019-03-10
@@ -12,7 +15,7 @@ import javafx.stage.Stage;
 * GameEndGUI class, Initializes and displays the graphical interface for when you lose
 *
 */
-public class GameEndGUI extends Player{
+public class GameEndGUI extends Player {
 
     private Label title;
     private VBox vBox;
diff --git a/src/LoanSharkGUI.java b/src/gui/LoanSharkGUI.java
similarity index 99%
rename from src/LoanSharkGUI.java
rename to src/gui/LoanSharkGUI.java
index ad67eb4..542fb8f 100644
--- a/src/LoanSharkGUI.java
+++ b/src/gui/LoanSharkGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
@@ -10,6 +12,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import logic.Player;
 
 /**
  * 2019-03-10
diff --git a/src/MainGUI.java b/src/gui/MainGUI.java
similarity index 98%
rename from src/MainGUI.java
rename to src/gui/MainGUI.java
index 277f0e1..3828af1 100644
--- a/src/MainGUI.java
+++ b/src/gui/MainGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.application.Application;
 import javafx.stage.Stage;
 
diff --git a/src/RandomEventGUI.java b/src/gui/RandomEventGUI.java
similarity index 99%
rename from src/RandomEventGUI.java
rename to src/gui/RandomEventGUI.java
index c367d78..2fae948 100644
--- a/src/RandomEventGUI.java
+++ b/src/gui/RandomEventGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -5,6 +7,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import logic.Player;
 
 import java.util.Random;
 
@@ -15,7 +18,7 @@ import java.util.Random;
  * liu yen asking for money and to purchase a gun.
  */
 
-public class RandomEventGUI extends Player{
+public class RandomEventGUI extends Player {
 
     private HBox hBox;
     private Button yesButton;
diff --git a/src/ShipWarfareGUI.java b/src/gui/ShipWarfareGUI.java
similarity index 99%
rename from src/ShipWarfareGUI.java
rename to src/gui/ShipWarfareGUI.java
index 26b3998..cd64007 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/gui/ShipWarfareGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.animation.*;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -14,10 +16,14 @@ import javafx.scene.layout.VBox;
 import javafx.scene.shape.Circle;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-
 import java.io.FileInputStream;
 import java.util.Random;
 
+//Importing the logic classes required for this class
+import logic.Player;
+import logic.ShipWarfareLogic;
+
+
 /**
  * 2019-03-10 (Edited on 2019-03-23)
  * Author: Haris Muhammad
diff --git a/src/StartGUI.java b/src/gui/StartGUI.java
similarity index 98%
rename from src/StartGUI.java
rename to src/gui/StartGUI.java
index 261f274..35f910e 100644
--- a/src/StartGUI.java
+++ b/src/gui/StartGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
@@ -8,6 +10,8 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import logic.Player;
+import logic.FileSaving;
 
 /**
  * 2019-03-10
@@ -17,7 +21,7 @@ import javafx.stage.Stage;
  */
 
 
-public class StartGUI extends Player{
+public class StartGUI extends Player {
 
     private BorderPane borderPane = new BorderPane();
     private HBox hBox = new HBox();
diff --git a/src/TaipanShopGUI.java b/src/gui/TaipanShopGUI.java
similarity index 99%
rename from src/TaipanShopGUI.java
rename to src/gui/TaipanShopGUI.java
index 82d1020..31f3428 100644
--- a/src/TaipanShopGUI.java
+++ b/src/gui/TaipanShopGUI.java
@@ -1,4 +1,4 @@
-/**
+package gui; /**
  * TaipanShopGUI deals with setting the stage for shop.
  *
  * Author: Vikram Bawa
@@ -19,8 +19,11 @@ import javafx.scene.shape.Rectangle;
 import javafx.scene.shape.StrokeType;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import logic.FileSaving;
+import logic.Player;
+import logic.TaipanShopLogic;
 
-public class TaipanShopGUI extends Player{
+public class TaipanShopGUI extends Player {
     private Label firm = new Label();
     private Label wItemsText = new Label();
     private Label wItemSpaceText = new Label();
@@ -51,7 +54,7 @@ public class TaipanShopGUI extends Player{
      *
      * @param player is a Player object that will be copied and the player instance variable is set to the copy.
      */
-    public TaipanShopGUI(Player player) {
+    public TaipanShopGUI(logic.Player player) {
         Player playerDummy = new Player(player);
         setPlayer(playerDummy);
     }
diff --git a/src/TravelGUI.java b/src/gui/TravelGUI.java
similarity index 98%
rename from src/TravelGUI.java
rename to src/gui/TravelGUI.java
index 18d92c4..24b4559 100644
--- a/src/TravelGUI.java
+++ b/src/gui/TravelGUI.java
@@ -1,4 +1,4 @@
-/**
+package gui; /**
  * TravelGUI is the class in which takes the player from location to location
  *
  * Author: Harkamal Randhawa
@@ -9,19 +9,14 @@ import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.StrokeType;
 import javafx.stage.Stage;
-import javafx.geometry.Insets;
 import javafx.scene.control.Label;
-import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
+import logic.Player;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.Random;
 
-public class TravelGUI extends Player{
+public class TravelGUI extends Player {
     private TaipanShopGUI shop;
     private Label firm = new Label();
     private Label wItemsText = new Label();
diff --git a/src/WarehouseGUI.java b/src/gui/WarehouseGUI.java
similarity index 99%
rename from src/WarehouseGUI.java
rename to src/gui/WarehouseGUI.java
index c489508..7b576c5 100644
--- a/src/WarehouseGUI.java
+++ b/src/gui/WarehouseGUI.java
@@ -1,3 +1,5 @@
+package gui;
+
 import javafx.geometry.Insets;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
@@ -6,6 +8,7 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
+import logic.Player;
 
 /**
  * 2019-03-19
@@ -13,7 +16,7 @@ import javafx.stage.Stage;
  * WarehouseGUI allows the user to store goods in a warehouse in order to have more hold on the ship
  */
 
-public class WarehouseGUI extends Player{
+public class WarehouseGUI extends Player {
     //Create the labels, buttons and textfields required
     private HBox hBox;
     private VBox vBox;
diff --git a/src/FileSaving.java b/src/logic/FileSaving.java
similarity index 99%
rename from src/FileSaving.java
rename to src/logic/FileSaving.java
index 9956f63..634a96a 100644
--- a/src/FileSaving.java
+++ b/src/logic/FileSaving.java
@@ -1,3 +1,5 @@
+package logic;
+
 import java.io.*;
 /**
  * 2019-03-10 (Edited on 2019-03-19)
diff --git a/src/Player.java b/src/logic/Player.java
similarity index 99%
rename from src/Player.java
rename to src/logic/Player.java
index 72c99da..3c37987 100644
--- a/src/Player.java
+++ b/src/logic/Player.java
@@ -1,3 +1,5 @@
+package logic;
+
 import java.io.Serializable;
 
 /**
diff --git a/src/ShipWarfareLogic.java b/src/logic/ShipWarfareLogic.java
similarity index 99%
rename from src/ShipWarfareLogic.java
rename to src/logic/ShipWarfareLogic.java
index 287c466..14b0bc5 100644
--- a/src/ShipWarfareLogic.java
+++ b/src/logic/ShipWarfareLogic.java
@@ -1,3 +1,5 @@
+package logic;
+
 import java.util.Random;
 
 /**
diff --git a/src/TaipanShopLogic.java b/src/logic/TaipanShopLogic.java
similarity index 99%
rename from src/TaipanShopLogic.java
rename to src/logic/TaipanShopLogic.java
index f10732c..6a11270 100644
--- a/src/TaipanShopLogic.java
+++ b/src/logic/TaipanShopLogic.java
@@ -1,4 +1,4 @@
-/**
+package logic; /**
  * TaipanShopLogic deals with the computations necessary for the shop such as randomizing prices.
  *
  * Author: Vikram Bawa
diff --git a/src/PlayerTest.java b/src/tests/PlayerTest.java
similarity index 62%
rename from src/PlayerTest.java
rename to src/tests/PlayerTest.java
index e86694e..f77f087 100644
--- a/src/PlayerTest.java
+++ b/src/tests/PlayerTest.java
@@ -1,6 +1,9 @@
+package tests;
 
 import static org.junit.Assert.*;
 
+import logic.Player;
+import org.junit.Assert;
 import org.junit.Test;
 import java.io.*;
 
@@ -21,7 +24,7 @@ public class PlayerTest {
     @Test
     public void getCargoSpace() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 60, player.getCargoSpace());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 60, player.getCargoSpace());
     }
 
     /**
@@ -31,7 +34,7 @@ public class PlayerTest {
     public void setCargoSpace() {
         Player player = new Player();
         player.setCargoSpace(10);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 10, player.getCargoSpace());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 10, player.getCargoSpace());
     }
 
     /**
@@ -40,7 +43,7 @@ public class PlayerTest {
     @Test
     public void getAttackingShips() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", true, player.getAttackingShips());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", true, player.getAttackingShips());
     }
 
     /**
@@ -50,7 +53,7 @@ public class PlayerTest {
     public void setAttackingShips() {
         Player player = new Player();
         player.setAttackingShips(false);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", false, player.getAttackingShips());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", false, player.getAttackingShips());
     }
 
     /**
@@ -59,7 +62,7 @@ public class PlayerTest {
     @Test
     public void getRetire() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", false, player.getRetire());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", false, player.getRetire());
     }
 
     /**
@@ -69,7 +72,7 @@ public class PlayerTest {
     public void setRetire() {
         Player player = new Player();
         player.setRetire(true);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", true, player.getRetire());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", true, player.getRetire());
     }
 
     /**
@@ -78,7 +81,7 @@ public class PlayerTest {
     @Test
     public void getName() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", "Taipan", player.getName());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", "Taipan", player.getName());
     }
 
     /**
@@ -88,7 +91,7 @@ public class PlayerTest {
     public void setName() {
         Player player = new Player();
         player.setName("a");
-        assertEquals("The instance variable for the object does not line up with the rest of the class", "a", player.getName());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", "a", player.getName());
     }
 
     /**
@@ -97,7 +100,7 @@ public class PlayerTest {
     @Test
     public void getHP() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 100, player.getHP());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 100, player.getHP());
     }
 
     /**
@@ -107,7 +110,7 @@ public class PlayerTest {
     public void setHP() {
         Player player = new Player();
         player.setHP(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getHP());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getHP());
     }
 
     /**
@@ -116,7 +119,7 @@ public class PlayerTest {
     @Test
     public void getBank() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getBank());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getBank());
     }
 
     /**
@@ -126,7 +129,7 @@ public class PlayerTest {
     public void setBank() {
         Player player = new Player();
         player.setBank(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getBank());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getBank());
     }
 
     /**
@@ -135,7 +138,7 @@ public class PlayerTest {
     @Test
     public void getMoney() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getMoney());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getMoney());
     }
 
     /**
@@ -145,7 +148,7 @@ public class PlayerTest {
     public void setMoney() {
         Player player = new Player();
         player.setMoney(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getMoney());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getMoney());
     }
 
     /**
@@ -154,7 +157,7 @@ public class PlayerTest {
     @Test
     public void getOpiumHeld() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getOpiumHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getOpiumHeld());
     }
 
     /**
@@ -164,7 +167,7 @@ public class PlayerTest {
     public void setOpiumHeld() {
         Player player = new Player();
         player.setOpiumHeld(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getOpiumHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getOpiumHeld());
     }
 
     /**
@@ -173,7 +176,7 @@ public class PlayerTest {
     @Test
     public void getSilkHeld() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getSilkHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getSilkHeld());
     }
 
     /**
@@ -183,7 +186,7 @@ public class PlayerTest {
     public void setSilkHeld() {
         Player player = new Player();
         player.setSilkHeld(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getSilkHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getSilkHeld());
     }
 
     /**
@@ -192,7 +195,7 @@ public class PlayerTest {
     @Test
     public void getGeneralHeld() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getGeneralHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getGeneralHeld());
     }
 
     /**
@@ -202,7 +205,7 @@ public class PlayerTest {
     public void setGeneralHeld() {
         Player player = new Player();
         player.setGeneralHeld(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGeneralHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGeneralHeld());
     }
 
     /**
@@ -211,7 +214,7 @@ public class PlayerTest {
     @Test
     public void getArmsHeld() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getArmsHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getArmsHeld());
     }
 
     /**
@@ -221,7 +224,7 @@ public class PlayerTest {
     public void setArmsHeld() {
         Player player = new Player();
         player.setArmsHeld(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getArmsHeld());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getArmsHeld());
     }
 
     /**
@@ -230,7 +233,7 @@ public class PlayerTest {
     @Test
     public void getLocation() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getLocation());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getLocation());
     }
 
     /**
@@ -240,7 +243,7 @@ public class PlayerTest {
     public void setLocation() {
         Player player = new Player();
         player.setLocation(2);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 2, player.getLocation());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 2, player.getLocation());
     }
 
     /**
@@ -249,7 +252,7 @@ public class PlayerTest {
     @Test
     public void getGuns() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 5, player.getGuns());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 5, player.getGuns());
     }
 
     /**
@@ -259,7 +262,7 @@ public class PlayerTest {
     public void setGuns() {
         Player player = new Player();
         player.setGuns(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGuns());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGuns());
     }
 
     /**
@@ -268,7 +271,7 @@ public class PlayerTest {
     @Test
     public void getDebt() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getDebt());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getDebt());
     }
 
     /**
@@ -278,7 +281,7 @@ public class PlayerTest {
     public void setDebt() {
         Player player = new Player();
         player.setDebt(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getDebt());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getDebt());
     }
 
     /**
@@ -287,7 +290,7 @@ public class PlayerTest {
     @Test
     public void getwOpium() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwOpium());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwOpium());
     }
 
     /**
@@ -297,7 +300,7 @@ public class PlayerTest {
     public void setwOpium() {
         Player player = new Player();
         player.setwOpium(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwOpium());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwOpium());
     }
 
     /**
@@ -306,7 +309,7 @@ public class PlayerTest {
     @Test
     public void getwSilk() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwSilk());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwSilk());
     }
 
     /**
@@ -316,7 +319,7 @@ public class PlayerTest {
     public void setwSilk() {
         Player player = new Player();
         player.setwSilk(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwSilk());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwSilk());
     }
 
     /**
@@ -325,7 +328,7 @@ public class PlayerTest {
     @Test
     public void getwGeneral() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwGeneral());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwGeneral());
     }
 
     /**
@@ -335,7 +338,7 @@ public class PlayerTest {
     public void setwGeneral() {
         Player player = new Player();
         player.setwGeneral(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwGeneral());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwGeneral());
     }
 
     /**
@@ -344,7 +347,7 @@ public class PlayerTest {
     @Test
     public void getwArms() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwArms());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwArms());
     }
 
     /**
@@ -354,7 +357,7 @@ public class PlayerTest {
     public void setwArms() {
         Player player = new Player();
         player.setwArms(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwArms());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwArms());
     }
 
     /**
@@ -363,7 +366,7 @@ public class PlayerTest {
     @Test
     public void getOpiumPrice() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 16000, player.getOpiumPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 16000, player.getOpiumPrice());
     }
 
     /**
@@ -373,7 +376,7 @@ public class PlayerTest {
     public void setOpiumPrice() {
         Player player = new Player();
         player.setOpiumPrice(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getOpiumPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getOpiumPrice());
     }
 
     /**
@@ -382,7 +385,7 @@ public class PlayerTest {
     @Test
     public void getSilkPrice() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1600, player.getSilkPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1600, player.getSilkPrice());
     }
 
     /**
@@ -392,7 +395,7 @@ public class PlayerTest {
     public void setSilkPrice() {
         Player player = new Player();
         player.setSilkPrice(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getSilkPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getSilkPrice());
     }
 
     /**
@@ -401,7 +404,7 @@ public class PlayerTest {
     @Test
     public void getArmsPrice() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 160, player.getArmsPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 160, player.getArmsPrice());
     }
 
     /**
@@ -411,7 +414,7 @@ public class PlayerTest {
     public void setArmsPrice() {
         Player player = new Player();
         player.setArmsPrice(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getArmsPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getArmsPrice());
     }
 
     /**
@@ -420,7 +423,7 @@ public class PlayerTest {
     @Test
     public void getGeneralPrice() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 8, player.getGeneralPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 8, player.getGeneralPrice());
     }
 
     /**
@@ -430,7 +433,7 @@ public class PlayerTest {
     public void setGeneralPrice() {
         Player player = new Player();
         player.setGeneralPrice(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGeneralPrice());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGeneralPrice());
     }
 
     /**
@@ -439,7 +442,7 @@ public class PlayerTest {
     @Test
     public void getIsPriceChanged() {
         Player player = new Player();
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getIsPriceChanged());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getIsPriceChanged());
     }
 
     /**
@@ -449,6 +452,6 @@ public class PlayerTest {
     public void setIsPriceChanged() {
         Player player = new Player();
         player.setIsPriceChanged(1);
-        assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getIsPriceChanged());
+        Assert.assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getIsPriceChanged());
     }
 }
diff --git a/src/BankText.java b/src/text/BankText.java
similarity index 84%
rename from src/BankText.java
rename to src/text/BankText.java
index 608bbe9..f16b1b8 100644
--- a/src/BankText.java
+++ b/src/text/BankText.java
@@ -1,3 +1,7 @@
+package text;
+
+import logic.Player;
+
 public class BankText extends Player {
     public BankText(Player player) {
         Player playerDummy = new Player(player);
diff --git a/src/ShipWarfareText.java b/src/text/ShipWarfareText.java
similarity index 99%
rename from src/ShipWarfareText.java
rename to src/text/ShipWarfareText.java
index 816906a..cb12e02 100644
--- a/src/ShipWarfareText.java
+++ b/src/text/ShipWarfareText.java
@@ -1,3 +1,8 @@
+package text;
+
+import logic.Player;
+import logic.ShipWarfareLogic;
+
 import java.util.Scanner;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
diff --git a/src/TaipanShopText.java b/src/text/TaipanShopText.java
similarity index 99%
rename from src/TaipanShopText.java
rename to src/text/TaipanShopText.java
index 7613d12..533d2b2 100644
--- a/src/TaipanShopText.java
+++ b/src/text/TaipanShopText.java
@@ -1,10 +1,16 @@
+package text;
+
+import java.util.Scanner;
+
+import logic.Player;
+import logic.TaipanShopLogic;
+
 /**
  * TaipanShopText deals with the text based version of the shop.
  *
  * Author: Vikram Bawa
  */
-import java.util.Scanner;
-public class TaipanShopText extends Player{
+public class TaipanShopText extends Player {
     /**
      * This method is evoked if the user is eligible to win, and chooses to end the game (by winning).
      */
diff --git a/src/TravelText.java b/src/text/TravelText.java
similarity index 68%
rename from src/TravelText.java
rename to src/text/TravelText.java
index 46e881c..c10417e 100644
--- a/src/TravelText.java
+++ b/src/text/TravelText.java
@@ -1,4 +1,7 @@
-public class TravelText extends Player{
+package text;
+import logic.Player;
+
+public class TravelText extends Player {
 
     public TravelText(Player player) {
         Player playerDummy = new Player(player);
diff --git a/src/WarehouseText.java b/src/text/WarehouseText.java
similarity index 85%
rename from src/WarehouseText.java
rename to src/text/WarehouseText.java
index 6ce6a0b..cc36ed8 100644
--- a/src/WarehouseText.java
+++ b/src/text/WarehouseText.java
@@ -1,3 +1,7 @@
+package text;
+
+import logic.Player;
+
 public class WarehouseText extends Player {
     public WarehouseText(Player player) {
         Player playerDummy = new Player(player);
diff --git a/src/loanSharkText.java b/src/text/loanSharkText.java
similarity index 67%
rename from src/loanSharkText.java
rename to src/text/loanSharkText.java
index d794b16..2d67f45 100644
--- a/src/loanSharkText.java
+++ b/src/text/loanSharkText.java
@@ -1,4 +1,8 @@
-public class loanSharkText extends Player{
+package text;
+
+import logic.Player;
+
+public class loanSharkText extends Player {
     public loanSharkText(Player player) {
         Player playerDummy = new Player(player);
         setPlayer(playerDummy);