diff --git a/main.py b/main.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/EventHandler.py b/src/InputHandler.py
similarity index 92%
rename from src/EventHandler.py
rename to src/InputHandler.py
index 4af27bf..8d2781b 100644
--- a/src/EventHandler.py
+++ b/src/InputHandler.py
@@ -14,4 +14,4 @@ class EventHandler:
             self.targets[event].hit()
 
     def stop(self):
-        self.isRunning = False
\ No newline at end of file
+        self.isRunning = False
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/events/FlapEvent.py b/src/events/FlapEvent.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/events/LeftFlapEvent.py b/src/events/LeftFlapEvent.py
new file mode 100644
index 0000000..ff16814
--- /dev/null
+++ b/src/events/LeftFlapEvent.py
@@ -0,0 +1,7 @@
+from src.events.FlapEvent import FlapEvent
+from src.solenoids.RightFlapSolenoid import RightFlapSolenoid
+
+
+class RightFlapEvent(FlapEvent):
+    def __init__(self):
+        super(RightFlapSolenoid())
diff --git a/src/events/RightFlapEvent.py b/src/events/RightFlapEvent.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/events/RightKickerEvent.py b/src/events/RightKickerEvent.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/factories/DisplayFactory.py b/src/factories/DisplayFactory.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/factories/EventFactory.py b/src/factories/EventFactory.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/GameFactory.py b/src/factories/GameFactory.py
similarity index 96%
rename from src/GameFactory.py
rename to src/factories/GameFactory.py
index 5c99cc5..943e438 100644
--- a/src/GameFactory.py
+++ b/src/factories/GameFactory.py
@@ -1,11 +1,13 @@
 from src.config import *
 from src.networking.Networking import Networking
 
+from src.PlayerState import PlayerState
+
 from src.displays.PlayerDisplay import PlayerDisplay
 from src.displays.SpecialDisplay import SpecialDisplay
 
-from src.targets import *
 from src.EventHandler import EventHandler
+from src.targets import *
 
 from src.events.PointEvent import PointEvent
 
diff --git a/src/factories/PlayerStateFactory.py b/src/factories/PlayerStateFactory.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/factories/TargetFactory.py b/src/factories/TargetFactory.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/Bank.py b/src/targets/Bank.py
similarity index 74%
rename from src/Bank.py
rename to src/targets/Bank.py
index bf05ab1..ea2cc91 100644
--- a/src/Bank.py
+++ b/src/targets/Bank.py
@@ -1,7 +1,8 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class Bank(Target):
-    def __init__(self, targets):
+    def __init__(self, points, name, targets):
+        super(points, name)
         self.targets = targets
         self.__register_targets__()
 
diff --git a/src/BankTarget.py b/src/targets/BankTarget.py
similarity index 77%
rename from src/BankTarget.py
rename to src/targets/BankTarget.py
index 01af8cc..561c93f 100644
--- a/src/BankTarget.py
+++ b/src/targets/BankTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class BankTarget(Target):
     def __init__(self, points):
diff --git a/src/targets/FifthFixedTarget.py b/src/targets/FifthFixedTarget.py
deleted file mode 100644
index 5755e11..0000000
--- a/src/targets/FifthFixedTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class FifthFixedTarget(Target):
-    def __init__(self):
-        super(100, 'Fixed Target #5')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/FirstFixedTarget.py b/src/targets/FirstFixedTarget.py
deleted file mode 100644
index 69694f5..0000000
--- a/src/targets/FirstFixedTarget.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class FirstFixedTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/FourthFixedTarget.py b/src/targets/FourthFixedTarget.py
deleted file mode 100644
index 9a4defb..0000000
--- a/src/targets/FourthFixedTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class FourthFixedTarget(Target):
-    def __init__(self):
-        super(100, 'Fixed Target #4')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftDropTarget.py b/src/targets/LeftDropTarget.py
deleted file mode 100644
index 19c307f..0000000
--- a/src/targets/LeftDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class LeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Left Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftLaneButton2Target.py b/src/targets/LeftLaneButton2Target.py
deleted file mode 100644
index 8e8d9a4..0000000
--- a/src/targets/LeftLaneButton2Target.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton2Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #2")
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftLaneButton3Target.py b/src/targets/LeftLaneButton3Target.py
deleted file mode 100644
index fd82f8a..0000000
--- a/src/targets/LeftLaneButton3Target.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton3Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #3")
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftLaneButton4Target.py b/src/targets/LeftLaneButton4Target.py
deleted file mode 100644
index 88a49d4..0000000
--- a/src/targets/LeftLaneButton4Target.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton4Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #4")
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftLaneButton5Target.py b/src/targets/LeftLaneButton5Target.py
deleted file mode 100644
index beaa8b9..0000000
--- a/src/targets/LeftLaneButton5Target.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftLaneButton5Target(Target):
-    def __init__(self):
-        super(20000, "Left Lane Button #5")
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftPopBumperTarget.py b/src/targets/LeftPopBumperTarget.py
deleted file mode 100644
index 8293fc0..0000000
--- a/src/targets/LeftPopBumperTarget.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class LeftPopBumperTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/MiddleDropTarget.py b/src/targets/MiddleDropTarget.py
deleted file mode 100644
index 34cef34..0000000
--- a/src/targets/MiddleDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class MiddleDropTarget(Target):
-    def __init__(self):
-        super(100, 'Middle Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/MiddleLeftDropTarget.py b/src/targets/MiddleLeftDropTarget.py
deleted file mode 100644
index 53770b4..0000000
--- a/src/targets/MiddleLeftDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class MiddleLeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Middle Left Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/MiddleRightDropTarget.py b/src/targets/MiddleRightDropTarget.py
deleted file mode 100644
index 7c9f6b4..0000000
--- a/src/targets/MiddleRightDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class MiddleRightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Middle Right Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/ReboundContactTarget.py b/src/targets/ReboundContactTarget.py
index f6efd42..a3c8fb9 100644
--- a/src/targets/ReboundContactTarget.py
+++ b/src/targets/ReboundContactTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class ReboundContactTarget(Target):
     def __init__(self):
diff --git a/src/targets/RightDropTarget.py b/src/targets/RightDropTarget.py
deleted file mode 100644
index 79d0b09..0000000
--- a/src/targets/RightDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class RightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Right Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/RightPopBumperTarget.py b/src/targets/RightPopBumperTarget.py
deleted file mode 100644
index 2556d98..0000000
--- a/src/targets/RightPopBumperTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class RightPopBumperTarget(Target):
-    def __init__(self):
-        super(100, 'Right Pop Bumper')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/SecondFixedTarget.py b/src/targets/SecondFixedTarget.py
deleted file mode 100644
index e081f95..0000000
--- a/src/targets/SecondFixedTarget.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class SecondFixedTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/Target.py b/src/targets/Target.py
similarity index 100%
rename from src/Target.py
rename to src/targets/Target.py
diff --git a/src/targets/ThirdFixedTarget.py b/src/targets/ThirdFixedTarget.py
deleted file mode 100644
index 929318e..0000000
--- a/src/targets/ThirdFixedTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class ThirdFixedTarget(Target):
-    def __init__(self):
-        super(100, 'Fixed Target #3')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/UPLeftDropTarget.py b/src/targets/UPLeftDropTarget.py
deleted file mode 100644
index 3f4bc4a..0000000
--- a/src/targets/UPLeftDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPLeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Left Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/UPMiddleDropTarget.py b/src/targets/UPMiddleDropTarget.py
deleted file mode 100644
index 02b4e39..0000000
--- a/src/targets/UPMiddleDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPMiddleDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Middle Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/UPMiddleLeftDropTarget.py b/src/targets/UPMiddleLeftDropTarget.py
deleted file mode 100644
index 200c11f..0000000
--- a/src/targets/UPMiddleLeftDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPMiddleLeftDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Middle Left Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/UPMiddleRightDropTarget.py b/src/targets/UPMiddleRightDropTarget.py
deleted file mode 100644
index 7657b8b..0000000
--- a/src/targets/UPMiddleRightDropTarget.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from src.Target import Target
-
-class UPMiddleRightDropTarget(Target):
-    def __init__(self):
-        super(100, 'Upper Playfield: Middle Right Drop Target')
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/UPRightDropTarget.py b/src/targets/UPRightDropTarget.py
deleted file mode 100644
index 3e3839c..0000000
--- a/src/targets/UPRightDropTarget.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class UPRightDropTarget(Target):
-    def __init__(self):
-        super(100000, "Upper Playfield Right Drop Target")
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/UpperPlayfieldRollUnderTarget.py b/src/targets/UpperPlayfieldRollUnderTarget.py
deleted file mode 100644
index a070176..0000000
--- a/src/targets/UpperPlayfieldRollUnderTarget.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from src.Target import Target
-
-
-class UpperPlayfieldRollUnderTarget(Target):
-    def __init__(self):
-        super()
-
-    def hit(self):
-        super.hit()
\ No newline at end of file
diff --git a/src/targets/__init__.py b/src/targets/__init__.py
index eedb95f..b506fa1 100644
--- a/src/targets/__init__.py
+++ b/src/targets/__init__.py
@@ -3,6 +3,8 @@ __all__ = []
 import pkgutil
 import inspect
 
+__path__ = pkgutil.extend_path(__path__, __name__)
+
 for loader, name, is_pkg in pkgutil.walk_packages(__path__):
     module = loader.find_module(name).load_module(name)
 
diff --git a/src/targets/__pycache__/ReboundContactTarget.cpython-38.pyc b/src/targets/__pycache__/ReboundContactTarget.cpython-38.pyc
new file mode 100644
index 0000000..e67da4a
Binary files /dev/null and b/src/targets/__pycache__/ReboundContactTarget.cpython-38.pyc differ
diff --git a/src/targets/__pycache__/__init__.cpython-38.pyc b/src/targets/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 0000000..ea76c2c
Binary files /dev/null and b/src/targets/__pycache__/__init__.cpython-38.pyc differ
diff --git a/src/targets/LeftInlaneTarget.py b/src/targets/bottom_lanes/LeftInlaneTarget.py
similarity index 63%
rename from src/targets/LeftInlaneTarget.py
rename to src/targets/bottom_lanes/LeftInlaneTarget.py
index 79b53d5..6a55faf 100644
--- a/src/targets/LeftInlaneTarget.py
+++ b/src/targets/bottom_lanes/LeftInlaneTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftInlaneTarget(Target):
     def __init__(self):
diff --git a/src/targets/LeftOutlaneTarget.py b/src/targets/bottom_lanes/LeftOutlaneTarget.py
similarity index 63%
rename from src/targets/LeftOutlaneTarget.py
rename to src/targets/bottom_lanes/LeftOutlaneTarget.py
index 56a790b..13da861 100644
--- a/src/targets/LeftOutlaneTarget.py
+++ b/src/targets/bottom_lanes/LeftOutlaneTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftOutlaneTarget(Target):
     def __init__(self):
diff --git a/src/targets/RightInlaneTarget.py b/src/targets/bottom_lanes/RightInlaneTarget.py
similarity index 62%
rename from src/targets/RightInlaneTarget.py
rename to src/targets/bottom_lanes/RightInlaneTarget.py
index 8e04755..7761bd3 100644
--- a/src/targets/RightInlaneTarget.py
+++ b/src/targets/bottom_lanes/RightInlaneTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightInlaneTarget(Target):
diff --git a/src/targets/RightOutlaneKickerTarget.py b/src/targets/bottom_lanes/RightOutlaneKickerTarget.py
similarity index 77%
rename from src/targets/RightOutlaneKickerTarget.py
rename to src/targets/bottom_lanes/RightOutlaneKickerTarget.py
index 99ca62d..b79d232 100644
--- a/src/targets/RightOutlaneKickerTarget.py
+++ b/src/targets/bottom_lanes/RightOutlaneKickerTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightOutlaneKickerTarget(Target):
diff --git a/src/targets/RightOutlaneTarget.py b/src/targets/bottom_lanes/RightOutlaneTarget.py
similarity index 67%
rename from src/targets/RightOutlaneTarget.py
rename to src/targets/bottom_lanes/RightOutlaneTarget.py
index 70d4157..67d095d 100644
--- a/src/targets/RightOutlaneTarget.py
+++ b/src/targets/bottom_lanes/RightOutlaneTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightOutlaneTarget(Target):
diff --git a/src/targets/bottom_lanes/__init__.py b/src/targets/bottom_lanes/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/canal/CanalButtonBottomTarget.py b/src/targets/canal/CanalButtonBottomTarget.py
new file mode 100644
index 0000000..b61df0d
--- /dev/null
+++ b/src/targets/canal/CanalButtonBottomTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class CanalButtonTopTarget(Target):
+    def __init__(self):
+        super(20000, "Canal Button Bottom")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/canal/CanalButtonMiddleBottomTarget.py b/src/targets/canal/CanalButtonMiddleBottomTarget.py
new file mode 100644
index 0000000..e55285f
--- /dev/null
+++ b/src/targets/canal/CanalButtonMiddleBottomTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftLaneButton4Target(Target):
+    def __init__(self):
+        super(20000, "Canal Button Middle Bottom")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/canal/CanalButtonMiddleTarget.py b/src/targets/canal/CanalButtonMiddleTarget.py
new file mode 100644
index 0000000..9da92f0
--- /dev/null
+++ b/src/targets/canal/CanalButtonMiddleTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftLaneButton3Target(Target):
+    def __init__(self):
+        super(20000, "Canal Button Middle")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/canal/CanalButtonMiddleTopTarget.py b/src/targets/canal/CanalButtonMiddleTopTarget.py
new file mode 100644
index 0000000..39f53b9
--- /dev/null
+++ b/src/targets/canal/CanalButtonMiddleTopTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftLaneButton2Target(Target):
+    def __init__(self):
+        super(20000, "Canal Button Middle Top")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/LeftLaneButton1Target.py b/src/targets/canal/CanalButtonTopTarget.py
similarity index 65%
rename from src/targets/LeftLaneButton1Target.py
rename to src/targets/canal/CanalButtonTopTarget.py
index e0b94fa..c4997eb 100644
--- a/src/targets/LeftLaneButton1Target.py
+++ b/src/targets/canal/CanalButtonTopTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftLaneButton1Target(Target):
     def __init__(self):
diff --git a/src/targets/canal/__init__.py b/src/targets/canal/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/fixed_targets/FixedTarget1.py b/src/targets/fixed_targets/FixedTarget1.py
new file mode 100644
index 0000000..b22e1fb
--- /dev/null
+++ b/src/targets/fixed_targets/FixedTarget1.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget1(Target):
+    def __init__(self):
+        super(0, "Fixed Target 1")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/fixed_targets/FixedTarget2.py b/src/targets/fixed_targets/FixedTarget2.py
new file mode 100644
index 0000000..92e0a72
--- /dev/null
+++ b/src/targets/fixed_targets/FixedTarget2.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget2(Target):
+    def __init__(self):
+        super(0, "Fixed Target 2")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/fixed_targets/FixedTarget3.py b/src/targets/fixed_targets/FixedTarget3.py
new file mode 100644
index 0000000..21bb8ce
--- /dev/null
+++ b/src/targets/fixed_targets/FixedTarget3.py
@@ -0,0 +1,8 @@
+from src.targets.Target import Target
+
+class FixedTarget3(Target):
+    def __init__(self):
+        super(100, 'Fixed Target 3')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/fixed_targets/FixedTarget4.py b/src/targets/fixed_targets/FixedTarget4.py
new file mode 100644
index 0000000..e0d817e
--- /dev/null
+++ b/src/targets/fixed_targets/FixedTarget4.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget4(Target):
+    def __init__(self):
+        super(100, 'Fixed Target 4')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/fixed_targets/FixedTarget5.py b/src/targets/fixed_targets/FixedTarget5.py
new file mode 100644
index 0000000..7e4ecc6
--- /dev/null
+++ b/src/targets/fixed_targets/FixedTarget5.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class FixedTarget5(Target):
+    def __init__(self):
+        super(100, 'Fixed Target 5')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/fixed_targets/__init__.py b/src/targets/fixed_targets/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/left_bank/LeftBankLeft.py b/src/targets/left_bank/LeftBankLeft.py
new file mode 100644
index 0000000..79cd8aa
--- /dev/null
+++ b/src/targets/left_bank/LeftBankLeft.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class LeftBankLeft(BankTarget):
+    def __init__(self):
+        super(100, 'Left Bank Left')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/left_bank/LeftBankMiddleLeft.py b/src/targets/left_bank/LeftBankMiddleLeft.py
new file mode 100644
index 0000000..2203639
--- /dev/null
+++ b/src/targets/left_bank/LeftBankMiddleLeft.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class LeftBankMiddleLeft(BankTarget):
+    def __init__(self):
+        super(100, 'Left Bank Middle Left')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/left_bank/LeftBankMiddleRight.py b/src/targets/left_bank/LeftBankMiddleRight.py
new file mode 100644
index 0000000..557ed49
--- /dev/null
+++ b/src/targets/left_bank/LeftBankMiddleRight.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class LeftBankMiddleRight(BankTarget):
+    def __init__(self):
+        super(100, 'Left Bank Middle Right')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/left_bank/LeftBankRight.py b/src/targets/left_bank/LeftBankRight.py
new file mode 100644
index 0000000..db64613
--- /dev/null
+++ b/src/targets/left_bank/LeftBankRight.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftBankLeft(Target):
+    def __init__(self):
+        super(100, 'Left Bank Right')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/left_bank/LeftBankTarget.py b/src/targets/left_bank/LeftBankTarget.py
new file mode 100644
index 0000000..3e270d6
--- /dev/null
+++ b/src/targets/left_bank/LeftBankTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Bank import Bank
+
+
+class LeftBankTarget(Bank):
+    def __init__(self):
+        super()
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/left_bank/__init__.py b/src/targets/left_bank/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/pop_bumpers/LeftPopTarget.py b/src/targets/pop_bumpers/LeftPopTarget.py
new file mode 100644
index 0000000..f365bc3
--- /dev/null
+++ b/src/targets/pop_bumpers/LeftPopTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class LeftPopTarget(Target):
+    def __init__(self):
+        super(0, "Left Pop")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/pop_bumpers/RightPopTarget.py b/src/targets/pop_bumpers/RightPopTarget.py
new file mode 100644
index 0000000..c64765e
--- /dev/null
+++ b/src/targets/pop_bumpers/RightPopTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class RightPopTarget(Target):
+    def __init__(self):
+        super(100, 'Right Pop')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/pop_bumpers/__init__.py b/src/targets/pop_bumpers/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/right_bank/RightBank.py b/src/targets/right_bank/RightBank.py
new file mode 100644
index 0000000..20f4a1f
--- /dev/null
+++ b/src/targets/right_bank/RightBank.py
@@ -0,0 +1,12 @@
+from src.targets.Bank import Bank
+from src.targets.right_bank import RightBankLeft
+from src.targets.right_bank import RightBankMiddle
+from src.targets.right_bank import RightBankRight
+
+class RightBank(Bank):
+    def __init__(self):
+        targets = [RightBankLeft(), RightBankMiddle(), RightBankRight]
+        super(0, "Right Bank", targets)
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/right_bank/RightBankLeft.py b/src/targets/right_bank/RightBankLeft.py
new file mode 100644
index 0000000..1dd2c94
--- /dev/null
+++ b/src/targets/right_bank/RightBankLeft.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class RightBankLeft(BankTarget):
+    def __init__(self):
+        super(100, "Right Bank Left")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/right_bank/RightBankMiddle.py b/src/targets/right_bank/RightBankMiddle.py
new file mode 100644
index 0000000..b4645be
--- /dev/null
+++ b/src/targets/right_bank/RightBankMiddle.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class MiddleDropTarget(BankTarget):
+    def __init__(self):
+        super(100, 'Right Bank Middle')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/right_bank/RightBankRight.py b/src/targets/right_bank/RightBankRight.py
new file mode 100644
index 0000000..34babc3
--- /dev/null
+++ b/src/targets/right_bank/RightBankRight.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class RightBankRight(BankTarget):
+    def __init__(self):
+        super(100, "Right Bank Right")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/right_bank/__init__.py b/src/targets/right_bank/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/LeftSlingshotTarget.py b/src/targets/slingshots/LeftSlingshotTarget.py
similarity index 64%
rename from src/targets/LeftSlingshotTarget.py
rename to src/targets/slingshots/LeftSlingshotTarget.py
index 2cf3576..a6a0848 100644
--- a/src/targets/LeftSlingshotTarget.py
+++ b/src/targets/slingshots/LeftSlingshotTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class LeftSlingshotTarget(Target):
     def __init__(self):
diff --git a/src/targets/RightSlingshotTarget.py b/src/targets/slingshots/RightSlingshotTarget.py
similarity index 67%
rename from src/targets/RightSlingshotTarget.py
rename to src/targets/slingshots/RightSlingshotTarget.py
index 4a0c8b9..5e79d0e 100644
--- a/src/targets/RightSlingshotTarget.py
+++ b/src/targets/slingshots/RightSlingshotTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 
 class RightSlingshotTarget(Target):
diff --git a/src/targets/slingshots/__init__.py b/src/targets/slingshots/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/FixedSpecialOrangeTarget.py b/src/targets/specials/SpecialOrangeTarget.py
similarity index 73%
rename from src/targets/FixedSpecialOrangeTarget.py
rename to src/targets/specials/SpecialOrangeTarget.py
index e29889d..2f89c53 100644
--- a/src/targets/FixedSpecialOrangeTarget.py
+++ b/src/targets/specials/SpecialOrangeTarget.py
@@ -1,11 +1,12 @@
-from src.Target import Target
+from src.targets.Target import Target
+
 
 # A standup target. When lit, it scores the Orange Special (operator
 # adjustable) for Nothing, Extra Ball, Replay, Super Bonus, or 300,000
 # points. Scores 100,000 points when not lit.
 class FixedSpecialOrangeTarget(Target):
     def __init__(self):
-        super(100000, "Fixed Special Orange")
+        super(100000, "Special Orange")
 
     def hit(self):
         super.hit()
\ No newline at end of file
diff --git a/src/targets/FixedSpecialRedTarget.py b/src/targets/specials/SpecialRedTarget.py
similarity index 73%
rename from src/targets/FixedSpecialRedTarget.py
rename to src/targets/specials/SpecialRedTarget.py
index caf0a0c..d2a02a9 100644
--- a/src/targets/FixedSpecialRedTarget.py
+++ b/src/targets/specials/SpecialRedTarget.py
@@ -1,11 +1,12 @@
-from src.Target import Target
+from src.targets.Target import Target
+
 
 # A standup target. When lit, it scores the Red Special (operator
 # adjustable) for Nothing, Extra Ball, Replay, Super Bonus, or 1,000,000
 # points. Scores 10,000 points when not lit.
 class FixedSpecialRedTarget(Target):
     def __init__(self):
-        super(10000, "Fixed Special Red")
+        super(10000, "Special Red")
 
     def hit(self):
         super.hit()
\ No newline at end of file
diff --git a/src/targets/SpinnerTarget.py b/src/targets/specials/SpinnerTarget.py
similarity index 61%
rename from src/targets/SpinnerTarget.py
rename to src/targets/specials/SpinnerTarget.py
index 95577e8..aeea07f 100644
--- a/src/targets/SpinnerTarget.py
+++ b/src/targets/specials/SpinnerTarget.py
@@ -1,4 +1,4 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class SpinnerTarget(Target):
     def __init__(self):
diff --git a/src/targets/specials/__init__.py b/src/targets/specials/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/technical/CreditTarget.py b/src/targets/technical/CreditTarget.py
new file mode 100644
index 0000000..988c5cc
--- /dev/null
+++ b/src/targets/technical/CreditTarget.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class CreditTarget(Target):
+    def __init__(self):
+        super(0, 'Credit')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/OutholeTarget.py b/src/targets/technical/OutholeTarget.py
similarity index 55%
rename from src/targets/OutholeTarget.py
rename to src/targets/technical/OutholeTarget.py
index 8cf92e3..f2e474f 100644
--- a/src/targets/OutholeTarget.py
+++ b/src/targets/technical/OutholeTarget.py
@@ -1,8 +1,8 @@
-from src.Target import Target
+from src.targets.Target import Target
 
 class OutholeTarget(Target):
     def __init__(self):
-        super(100, 'Outhole Target')
+        super(100, 'Outhole')
 
     def hit(self):
         super.hit()
diff --git a/src/targets/technical/RisingBall.py b/src/targets/technical/RisingBall.py
new file mode 100644
index 0000000..97f57dd
--- /dev/null
+++ b/src/targets/technical/RisingBall.py
@@ -0,0 +1,9 @@
+from src.targets.Target import Target
+
+
+class RisingBall(Target):
+    def __init__(self):
+        super(0, "Rising Ball")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/technical/__init__.py b/src/targets/technical/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/targets/top_bank/TopBank.py b/src/targets/top_bank/TopBank.py
new file mode 100644
index 0000000..f34319d
--- /dev/null
+++ b/src/targets/top_bank/TopBank.py
@@ -0,0 +1,9 @@
+from Target import Target
+
+
+class TopBank(Target):
+    def __init__(self):
+        super()
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/top_bank/TopBankLeft.py b/src/targets/top_bank/TopBankLeft.py
new file mode 100644
index 0000000..1b8f6c0
--- /dev/null
+++ b/src/targets/top_bank/TopBankLeft.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankLeft(BankTarget):
+    def __init__(self):
+        super(100, 'Top Bank Left')
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/top_bank/TopBankMiddle.py b/src/targets/top_bank/TopBankMiddle.py
new file mode 100644
index 0000000..f0507d3
--- /dev/null
+++ b/src/targets/top_bank/TopBankMiddle.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankMiddle(BankTarget):
+    def __init__(self):
+        super(100, "Top Bank Middle")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/top_bank/TopBankMiddleLeft.py b/src/targets/top_bank/TopBankMiddleLeft.py
new file mode 100644
index 0000000..93d1553
--- /dev/null
+++ b/src/targets/top_bank/TopBankMiddleLeft.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankMiddleLeft(BankTarget):
+    def __init__(self):
+        super(100, "Top Bank Middle Left")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/top_bank/TopBankMiddleRight.py b/src/targets/top_bank/TopBankMiddleRight.py
new file mode 100644
index 0000000..da47f65
--- /dev/null
+++ b/src/targets/top_bank/TopBankMiddleRight.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankMiddleRight(BankTarget):
+    def __init__(self):
+        super(100, "Top Bank Middle Right")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/top_bank/TopBankRight.py b/src/targets/top_bank/TopBankRight.py
new file mode 100644
index 0000000..38a9a37
--- /dev/null
+++ b/src/targets/top_bank/TopBankRight.py
@@ -0,0 +1,9 @@
+from src.targets.BankTarget import BankTarget
+
+
+class TopBankRight(BankTarget):
+    def __init__(self):
+        super(100000, "Top Bank Right")
+
+    def hit(self):
+        super.hit()
\ No newline at end of file
diff --git a/src/targets/top_bank/__init__.py b/src/targets/top_bank/__init__.py
new file mode 100644
index 0000000..e69de29