diff --git a/pocket_friends/__init__.py b/pocket_friends/__init__.py
index c8ad717..e5a9890 100644
--- a/pocket_friends/__init__.py
+++ b/pocket_friends/__init__.py
@@ -1 +1,4 @@
+"""Pocket Friends is a game where you raise your own little pocket friend! These pocket friends, called bloops,
+are great little companions to have! You can feed them, play with them, and watch them grow up!"""
+
 __version__ = 'dev_0.0.3'
diff --git a/pocket_friends/__main__.py b/pocket_friends/__main__.py
index c7ec3f8..298fb5f 100644
--- a/pocket_friends/__main__.py
+++ b/pocket_friends/__main__.py
@@ -5,8 +5,7 @@ import os
 import pygame
 import sys
 from pathlib import Path
-from pocket_friends.game_files.game import main as game_main
-#from pocket_friends.development.dev_menu import main as dev_menu_main
+import pocket_friends.game_files.game as game
 
 if __name__ == '__main__':
     enable_dev = False
@@ -14,19 +13,11 @@ if __name__ == '__main__':
     # enable dev mode if --dev argument is passed
     if len(sys.argv) > 0:
         for args in sys.argv:
-            #if args == '--dev': [reimplement later]
-            #    enable_dev = True
             if args == '--delete-save':
                 save_dir = os.path.join(Path.home(), '.pocket_friends')
                 os.remove(save_dir + '/save.json')
 
-    # Dev menu disabled for now, will reimplement later
-    #if not enable_dev:
-    #    game_main()
-    #else:
-    #    dev_menu_main()
-
-    game_main()
+    game.main()
 
     pygame.quit()
     sys.exit()
diff --git a/pocket_friends/development/button_test.py b/pocket_friends/development/button_test.py
index 43d1cc1..df5353c 100644
--- a/pocket_friends/development/button_test.py
+++ b/pocket_friends/development/button_test.py
@@ -2,7 +2,7 @@
 Module to test the GPIO input on the Raspberry Pi.
 """
 from collections import deque
-from pocket_friends.game_files.io_helpers.gpio_handler import Constants, GPIOHandler
+from pocket_friends.game_files.io.gpio_handler import Constants, GPIOHandler
 
 
 def button_test():
diff --git a/pocket_friends/development/dev_menu.py b/pocket_friends/development/dev_menu.py
index e390769..9dead9b 100644
--- a/pocket_friends/development/dev_menu.py
+++ b/pocket_friends/development/dev_menu.py
@@ -8,13 +8,13 @@ import pygame
 import time
 from .button_test import button_test
 from .menus import Menu
-from pocket_friends.game_files.io_helpers.gpio_handler import GPIOHandler, Constants
+from pocket_friends.game_files.io.gpio_handler import GPIOHandler, Constants
 
 try:
     importlib.util.find_spec('RPi.GPIO')
     import RPi.GPIO as GPIO
 except ImportError:
-    import pocket_friends.game_files.io_helpers.fake_gpio as GPIO
+    import pocket_friends.game_files.io.fake_gpio as GPIO
 
 # Global variable to keep track of the current menu.
 menu = 'main'
diff --git a/pocket_friends/game_files/__init__.py b/pocket_friends/game_files/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pocket_friends/game_files/io/__init__.py b/pocket_friends/game_files/io/__init__.py
new file mode 100644
index 0000000..d266b0e
--- /dev/null
+++ b/pocket_friends/game_files/io/__init__.py
@@ -0,0 +1,2 @@
+"""Sub-package for handling all I/O operations including keyboard input (GPIO input when connected to a Raspberry Pi)
+and save data reading and writing."""
\ No newline at end of file
diff --git a/pocket_friends/game_files/io_helpers/data_handler.py b/pocket_friends/game_files/io/data_handler.py
similarity index 100%
rename from pocket_friends/game_files/io_helpers/data_handler.py
rename to pocket_friends/game_files/io/data_handler.py
diff --git a/pocket_friends/game_files/io_helpers/fake_gpio.py b/pocket_friends/game_files/io/fake_gpio.py
similarity index 100%
rename from pocket_friends/game_files/io_helpers/fake_gpio.py
rename to pocket_friends/game_files/io/fake_gpio.py
diff --git a/pocket_friends/game_files/io/gpio_handler.py b/pocket_friends/game_files/io/gpio_handler.py
new file mode 100644
index 0000000..01e3423
--- /dev/null
+++ b/pocket_friends/game_files/io/gpio_handler.py
@@ -0,0 +1,62 @@
+"""
+Handle inputs from the GPIO pins on the Raspberry Pi and converting them to events to be used in other places (pygame, etc.)
+"""
+import importlib.util
+
+# If the RPi.GPIO module is not found (aka the program is not running on a Pi), import the fake
+# GPIO module instead to prevent a crash.
+try:
+    importlib.util.find_spec('RPi.GPIO')
+    import RPi.GPIO as GPIO
+except ImportError:
+    import pocket_friends.game_files.io.fake_gpio as GPIO
+
+# Dictionary of all the buttons used and what their corresponding GPIO codes are
+BUTTONS = {
+    'a': 31,  # A button
+    'b': 29,  # B button
+    'j_i': 7,  # Joystick in
+    'j_u': 11,  # Joystick up
+    'j_d': 15,  # Joystick down
+    'j_l': 13,  # Joystick left
+    'j_r': 16  # Joystick right
+}
+
+
+def setup():
+    """
+    Primes the GPIO pins for reading the inputs of the buttons.
+    """
+    GPIO.setmode(GPIO.BOARD)
+
+    GPIO.setup(BUTTONS.get('a'), GPIO.IN)
+    GPIO.setup(BUTTONS.get('b'), GPIO.IN)
+    GPIO.setup(BUTTONS.get('j_i'), GPIO.IN)
+    GPIO.setup(BUTTONS.get('j_u'), GPIO.IN)
+    GPIO.setup(BUTTONS.get('j_d'), GPIO.IN)
+    GPIO.setup(BUTTONS.get('j_l'), GPIO.IN)
+    GPIO.setup(BUTTONS.get('j_r'), GPIO.IN)
+
+    GPIO.add_event_detect(BUTTONS.get('a'), GPIO.FALLING)
+    GPIO.add_event_detect(BUTTONS.get('b'), GPIO.FALLING)
+    GPIO.add_event_detect(BUTTONS.get('j_i'), GPIO.FALLING)
+    GPIO.add_event_detect(BUTTONS.get('j_u'), GPIO.FALLING)
+    GPIO.add_event_detect(BUTTONS.get('j_d'), GPIO.FALLING)
+    GPIO.add_event_detect(BUTTONS.get('j_l'), GPIO.FALLING)
+    GPIO.add_event_detect(BUTTONS.get('j_r'), GPIO.FALLING)
+
+
+def teardown():
+    """
+    Cleans up the GPIO handler.
+    """
+    GPIO.cleanup()
+
+
+def get_press(button):
+    """
+    Returns true if a button has changed from not pressed to pressed.
+    :param button: button to be detected
+    :return: True if the button is has been pressed, False otherwise
+    """
+    return GPIO.event_detected(button)
diff --git a/pocket_friends/game_files/io_helpers/input_handler.py b/pocket_friends/game_files/io/input_handler.py
similarity index 77%
rename from pocket_friends/game_files/io_helpers/input_handler.py
rename to pocket_friends/game_files/io/input_handler.py
index 3a45db7..5df6cd4 100644
--- a/pocket_friends/game_files/io_helpers/input_handler.py
+++ b/pocket_friends/game_files/io/input_handler.py
@@ -1,6 +1,6 @@
 import pygame
 import importlib.util
-from pocket_friends.game_files.io_helpers.gpio_handler import Constants, GPIOHandler
+import pocket_friends.game_files.io.gpio_handler as gpio_handler
 
 
 class InputHandler:
@@ -18,7 +18,7 @@ class InputHandler:
             import RPi.GPIO as GPIO
             self.on_hardware = True
         except ImportError:
-            import pocket_friends.game_files.io_helpers.fake_gpio as GPIO
+            import pocket_friends.game_files.io.fake_gpio as GPIO
             self.on_hardware = False
 
         self.last_input_tick = 0
@@ -38,11 +38,11 @@ class InputHandler:
         """
         Handles getting GPIO button presses and making a pygame event when a press is detected.
         """
-        for pressed_button in Constants.buttons:
-            code = Constants.buttons.get(pressed_button)
+        for pressed_button in gpio_handler.BUTTONS:
+            code = gpio_handler.BUTTONS.get(pressed_button)
 
             # Check if a button has been pressed. If it has, create a pygame event for it.
-            if GPIOHandler.get_press(code):
+            if gpio_handler.get_press(code):
                 self.create_event(code)
 
     def keyboard_handler(self):
@@ -56,19 +56,19 @@ class InputHandler:
                 running = False
             if keyboard_event.type == pygame.KEYDOWN:
                 if keyboard_event.key == pygame.K_a:
-                    self.create_event(Constants.buttons.get('a'))
+                    self.create_event(gpio_handler.BUTTONS.get('a'))
                 if keyboard_event.key == pygame.K_b:
-                    self.create_event(Constants.buttons.get('b'))
+                    self.create_event(gpio_handler.BUTTONS.get('b'))
                 if keyboard_event.key == pygame.K_PERIOD:
-                    self.create_event(Constants.buttons.get('j_i'))
+                    self.create_event(gpio_handler.BUTTONS.get('j_i'))
                 if keyboard_event.key == pygame.K_RIGHT:
-                    self.create_event(Constants.buttons.get('j_r'))
+                    self.create_event(gpio_handler.BUTTONS.get('j_r'))
                 if keyboard_event.key == pygame.K_LEFT:
-                    self.create_event(Constants.buttons.get('j_l'))
+                    self.create_event(gpio_handler.BUTTONS.get('j_l'))
                 if keyboard_event.key == pygame.K_DOWN:
-                    self.create_event(Constants.buttons.get('j_d'))
+                    self.create_event(gpio_handler.BUTTONS.get('j_d'))
                 if keyboard_event.key == pygame.K_UP:
-                    self.create_event(Constants.buttons.get('j_u'))
+                    self.create_event(gpio_handler.BUTTONS.get('j_u'))
                 if keyboard_event.key == pygame.K_ESCAPE:
                     running = False
 
diff --git a/pocket_friends/game_files/io_helpers/__init__.py b/pocket_friends/game_files/io_helpers/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pocket_friends/game_files/io_helpers/gpio_handler.py b/pocket_friends/game_files/io_helpers/gpio_handler.py
deleted file mode 100644
index 7e842c0..0000000
--- a/pocket_friends/game_files/io_helpers/gpio_handler.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-Module that helps with the handling of taking inputs from the GPIO pins on the Raspberry
-Pi and converting them to events to be used in other places (pygame, etc.)
-"""
-import importlib.util
-
-try:
-    importlib.util.find_spec('RPi.GPIO')
-    import RPi.GPIO as GPIO
-except ImportError:
-    import pocket_friends.game_files.io_helpers.fake_gpio as GPIO
-
-
-class Constants:
-    """
-    Contains the constants used by the HAT to read in buttons
-    """
-    buttons = {
-        'a': 31,  # A button
-        'b': 29,  # B button
-        'j_i': 7,  # Joystick in
-        'j_u': 11,  # Joystick up
-        'j_d': 15,  # Joystick down
-        'j_l': 13,  # Joystick left
-        'j_r': 16  # Joystick right
-    }
-
-
-class GPIOHandler:
-    """
-    Class to handle the GPIO inputs from the buttons.
-    """
-
-    @staticmethod
-    def setup():
-        """
-        Primes the GPIO pins for reading the inputs of the buttons.
-        """
-        GPIO.setmode(GPIO.BOARD)
-
-        GPIO.setup(Constants.buttons.get('a'), GPIO.IN)
-        GPIO.setup(Constants.buttons.get('b'), GPIO.IN)
-        GPIO.setup(Constants.buttons.get('j_i'), GPIO.IN)
-        GPIO.setup(Constants.buttons.get('j_u'), GPIO.IN)
-        GPIO.setup(Constants.buttons.get('j_d'), GPIO.IN)
-        GPIO.setup(Constants.buttons.get('j_l'), GPIO.IN)
-        GPIO.setup(Constants.buttons.get('j_r'), GPIO.IN)
-
-        GPIO.add_event_detect(Constants.buttons.get('a'), GPIO.FALLING)
-        GPIO.add_event_detect(Constants.buttons.get('b'), GPIO.FALLING)
-        GPIO.add_event_detect(Constants.buttons.get('j_i'), GPIO.FALLING)
-        GPIO.add_event_detect(Constants.buttons.get('j_u'), GPIO.FALLING)
-        GPIO.add_event_detect(Constants.buttons.get('j_d'), GPIO.FALLING)
-        GPIO.add_event_detect(Constants.buttons.get('j_l'), GPIO.FALLING)
-        GPIO.add_event_detect(Constants.buttons.get('j_r'), GPIO.FALLING)
-
-    @staticmethod
-    def teardown():
-        """
-        Cleans up the GPIO handler.
-        """
-        GPIO.cleanup()
-
-    @staticmethod
-    def get_press(button):
-        """
-        Returns true if a button has moved from not pressed to pressed.
-        :param button: button to be detected
-        :return: True if the button is has been pressed, False otherwise
-        """
-        return GPIO.event_detected(button)
\ No newline at end of file
diff --git a/pocket_friends/game_files/surfaces/resources/data/bloop_info/blue.json b/pocket_friends/game_files/resources/data/bloop_info/blue.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/data/bloop_info/blue.json
rename to pocket_friends/game_files/resources/data/bloop_info/blue.json
diff --git a/pocket_friends/game_files/surfaces/resources/data/bloop_info/dev_egg.json b/pocket_friends/game_files/resources/data/bloop_info/dev_egg.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/data/bloop_info/dev_egg.json
rename to pocket_friends/game_files/resources/data/bloop_info/dev_egg.json
diff --git a/pocket_friends/game_files/surfaces/resources/data/bloop_info/rainbow.json b/pocket_friends/game_files/resources/data/bloop_info/rainbow.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/data/bloop_info/rainbow.json
rename to pocket_friends/game_files/resources/data/bloop_info/rainbow.json
diff --git a/pocket_friends/game_files/surfaces/resources/data/bloop_info/red.json b/pocket_friends/game_files/resources/data/bloop_info/red.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/data/bloop_info/red.json
rename to pocket_friends/game_files/resources/data/bloop_info/red.json
diff --git a/pocket_friends/game_files/surfaces/resources/fonts/5Pts5.ttf b/pocket_friends/game_files/resources/fonts/5Pts5.ttf
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/fonts/5Pts5.ttf
rename to pocket_friends/game_files/resources/fonts/5Pts5.ttf
diff --git a/pocket_friends/game_files/icon/icon.ico b/pocket_friends/game_files/resources/icon/icon.ico
similarity index 100%
rename from pocket_friends/game_files/icon/icon.ico
rename to pocket_friends/game_files/resources/icon/icon.ico
diff --git a/pocket_friends/game_files/icon/icon.png b/pocket_friends/game_files/resources/icon/icon.png
similarity index 100%
rename from pocket_friends/game_files/icon/icon.png
rename to pocket_friends/game_files/resources/icon/icon.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bg.png b/pocket_friends/game_files/resources/images/bg.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bg.png
rename to pocket_friends/game_files/resources/images/bg.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/green/green.png b/pocket_friends/game_files/resources/images/bloops/_postponed/green/green.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/green/green.png
rename to pocket_friends/game_files/resources/images/bloops/_postponed/green/green.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/indigo/indigo.png b/pocket_friends/game_files/resources/images/bloops/_postponed/indigo/indigo.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/indigo/indigo.png
rename to pocket_friends/game_files/resources/images/bloops/_postponed/indigo/indigo.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/orange/orange.png b/pocket_friends/game_files/resources/images/bloops/_postponed/orange/orange.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/orange/orange.png
rename to pocket_friends/game_files/resources/images/bloops/_postponed/orange/orange.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/violet/violet.png b/pocket_friends/game_files/resources/images/bloops/_postponed/violet/violet.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/violet/violet.png
rename to pocket_friends/game_files/resources/images/bloops/_postponed/violet/violet.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/white/white.png b/pocket_friends/game_files/resources/images/bloops/_postponed/white/white.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/white/white.png
rename to pocket_friends/game_files/resources/images/bloops/_postponed/white/white.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/yellow/yellow.png b/pocket_friends/game_files/resources/images/bloops/_postponed/yellow/yellow.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/yellow/yellow.png
rename to pocket_friends/game_files/resources/images/bloops/_postponed/yellow/yellow.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.json b/pocket_friends/game_files/resources/images/bloops/blue/egg.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.json
rename to pocket_friends/game_files/resources/images/bloops/blue/egg.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.png b/pocket_friends/game_files/resources/images/bloops/blue/egg.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.png
rename to pocket_friends/game_files/resources/images/bloops/blue/egg.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.json b/pocket_friends/game_files/resources/images/bloops/dev_egg/baby.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.json
rename to pocket_friends/game_files/resources/images/bloops/dev_egg/baby.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.png b/pocket_friends/game_files/resources/images/bloops/dev_egg/baby.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.png
rename to pocket_friends/game_files/resources/images/bloops/dev_egg/baby.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.json b/pocket_friends/game_files/resources/images/bloops/dev_egg/egg.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.json
rename to pocket_friends/game_files/resources/images/bloops/dev_egg/egg.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.png b/pocket_friends/game_files/resources/images/bloops/dev_egg/egg.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.png
rename to pocket_friends/game_files/resources/images/bloops/dev_egg/egg.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.json b/pocket_friends/game_files/resources/images/bloops/rainbow/egg.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.json
rename to pocket_friends/game_files/resources/images/bloops/rainbow/egg.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.png b/pocket_friends/game_files/resources/images/bloops/rainbow/egg.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.png
rename to pocket_friends/game_files/resources/images/bloops/rainbow/egg.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.json b/pocket_friends/game_files/resources/images/bloops/red/egg.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.json
rename to pocket_friends/game_files/resources/images/bloops/red/egg.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.png b/pocket_friends/game_files/resources/images/bloops/red/egg.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.png
rename to pocket_friends/game_files/resources/images/bloops/red/egg.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/debug/invalid.png b/pocket_friends/game_files/resources/images/debug/invalid.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/debug/invalid.png
rename to pocket_friends/game_files/resources/images/debug/invalid.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/apple.png b/pocket_friends/game_files/resources/images/gui/apple.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/apple.png
rename to pocket_friends/game_files/resources/images/gui/apple.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/bar_graphic.png b/pocket_friends/game_files/resources/images/gui/bar_graphic.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/bar_graphic.png
rename to pocket_friends/game_files/resources/images/gui/bar_graphic.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/bar_outline.png b/pocket_friends/game_files/resources/images/gui/bar_outline.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/bar_outline.png
rename to pocket_friends/game_files/resources/images/gui/bar_outline.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/blank_star.png b/pocket_friends/game_files/resources/images/gui/blank_star.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/blank_star.png
rename to pocket_friends/game_files/resources/images/gui/blank_star.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/down_arrow.png b/pocket_friends/game_files/resources/images/gui/down_arrow.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/down_arrow.png
rename to pocket_friends/game_files/resources/images/gui/down_arrow.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/egg_selector.png b/pocket_friends/game_files/resources/images/gui/egg_selector.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/egg_selector.png
rename to pocket_friends/game_files/resources/images/gui/egg_selector.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.json b/pocket_friends/game_files/resources/images/gui/popup_menu/apple.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.json
rename to pocket_friends/game_files/resources/images/gui/popup_menu/apple.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.png b/pocket_friends/game_files/resources/images/gui/popup_menu/apple.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.png
rename to pocket_friends/game_files/resources/images/gui/popup_menu/apple.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.json b/pocket_friends/game_files/resources/images/gui/popup_menu/bed.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.json
rename to pocket_friends/game_files/resources/images/gui/popup_menu/bed.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.png b/pocket_friends/game_files/resources/images/gui/popup_menu/bed.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.png
rename to pocket_friends/game_files/resources/images/gui/popup_menu/bed.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.json b/pocket_friends/game_files/resources/images/gui/popup_menu/controller.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.json
rename to pocket_friends/game_files/resources/images/gui/popup_menu/controller.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.png b/pocket_friends/game_files/resources/images/gui/popup_menu/controller.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.png
rename to pocket_friends/game_files/resources/images/gui/popup_menu/controller.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.json b/pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.json
rename to pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.png b/pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.png
rename to pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/frame.png b/pocket_friends/game_files/resources/images/gui/popup_menu/frame.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/frame.png
rename to pocket_friends/game_files/resources/images/gui/popup_menu/frame.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.json b/pocket_friends/game_files/resources/images/gui/popup_menu/stats.json
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.json
rename to pocket_friends/game_files/resources/images/gui/popup_menu/stats.json
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.png b/pocket_friends/game_files/resources/images/gui/popup_menu/stats.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.png
rename to pocket_friends/game_files/resources/images/gui/popup_menu/stats.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/smiley.png b/pocket_friends/game_files/resources/images/gui/smiley.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/smiley.png
rename to pocket_friends/game_files/resources/images/gui/smiley.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/star.png b/pocket_friends/game_files/resources/images/gui/star.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/star.png
rename to pocket_friends/game_files/resources/images/gui/star.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/gui/up_arrow.png b/pocket_friends/game_files/resources/images/gui/up_arrow.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/gui/up_arrow.png
rename to pocket_friends/game_files/resources/images/gui/up_arrow.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/promotional.png b/pocket_friends/game_files/resources/images/promotional.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/promotional.png
rename to pocket_friends/game_files/resources/images/promotional.png
diff --git a/pocket_friends/game_files/surfaces/resources/images/title.png b/pocket_friends/game_files/resources/images/title.png
similarity index 100%
rename from pocket_friends/game_files/surfaces/resources/images/title.png
rename to pocket_friends/game_files/resources/images/title.png
diff --git a/pocket_friends/game_files/surfaces/egg_select.py b/pocket_friends/game_files/surfaces/egg_select.py
index 4ae0f98..7a97d90 100644
--- a/pocket_friends/game_files/surfaces/egg_select.py
+++ b/pocket_friends/game_files/surfaces/egg_select.py
@@ -1,7 +1,7 @@
 import pygame
 from . import sprites
-from pocket_friends.game_files.io_helpers.gpio_handler import Constants
-from ..io_helpers.input_handler import InputHandler
+import pocket_friends.game_files.io.gpio_handler as gpio_handler
+from ..io.input_handler import InputHandler
 
 
 class Surface(pygame.Surface):
@@ -133,15 +133,15 @@ class Surface(pygame.Surface):
 
         for event in pygame.event.get():
             if event.type == pygame.KEYDOWN:
-                if event.key == Constants.buttons.get('j_r'):
+                if event.key == gpio_handler.BUTTONS.get('j_r'):
                     self.sel_right()
-                if event.key == Constants.buttons.get('j_l'):
+                if event.key == gpio_handler.BUTTONS.get('j_l'):
                     self.sel_left()
-                if event.key == Constants.buttons.get('j_d'):
+                if event.key == gpio_handler.BUTTONS.get('j_d'):
                     self.sel_down()
-                if event.key == Constants.buttons.get('j_u'):
+                if event.key == gpio_handler.BUTTONS.get('j_u'):
                     self.sel_up()
-                if event.key == Constants.buttons.get('a'):
+                if event.key == gpio_handler.BUTTONS.get('a'):
                     self.additional_args = {'selected_egg': self.selected_color}
                     self.next_surface = 'selection_info'
                     self.running = False
diff --git a/pocket_friends/game_files/surfaces/selection_info.py b/pocket_friends/game_files/surfaces/selection_info.py
index e991276..80393b6 100644
--- a/pocket_friends/game_files/surfaces/selection_info.py
+++ b/pocket_friends/game_files/surfaces/selection_info.py
@@ -1,8 +1,8 @@
 import pygame
 from . import sprites
-from pocket_friends.game_files.io_helpers.gpio_handler import Constants
+import pocket_friends.game_files.io.gpio_handler as gpio_handler
 from .sprites import SelectionEgg
-from ..io_helpers.input_handler import InputHandler
+from ..io.input_handler import InputHandler
 
 
 class Surface(pygame.Surface):
@@ -46,15 +46,15 @@ class Surface(pygame.Surface):
 
         for event in pygame.event.get():
             if event.type == pygame.KEYDOWN:
-                if event.key == Constants.buttons.get('j_d'):
+                if event.key == gpio_handler.BUTTONS.get('j_d'):
                     # Scroll down on the info screen.
                     self.info_text.scroll_down()
-                if event.key == Constants.buttons.get('j_u'):
+                if event.key == gpio_handler.BUTTONS.get('j_u'):
                     # Scroll up on the info screen.
                     self.info_text.scroll_up()
-                if event.key == Constants.buttons.get('a'):
+                if event.key == gpio_handler.BUTTONS.get('a'):
                     pass
-                if event.key == Constants.buttons.get('b'):
+                if event.key == gpio_handler.BUTTONS.get('b'):
                     self.running = False
                     self.additional_args = {'selected_color': self.selected_egg}
                     self.next_surface = 'egg_select'