diff --git a/code.py b/code.py
index 27fed70..b26eb85 100644
--- a/code.py
+++ b/code.py
@@ -1,9 +1,8 @@
 from macropad_os import AppRouter, SerialComms, Config
-from macropad_os.system_apps import DebugApp
 
 from adafruit_macropad import MacroPad
 
-from python_apps import NumpadApp
+from macropad_apps.python import NumpadApp
 
 macropad = MacroPad()
 
diff --git a/macro_pad_apps/example.json b/macropad_apps/json/example.json
similarity index 100%
rename from macro_pad_apps/example.json
rename to macropad_apps/json/example.json
diff --git a/macro_pad_apps/gamepad.json b/macropad_apps/json/gamepad.json
similarity index 100%
rename from macro_pad_apps/gamepad.json
rename to macropad_apps/json/gamepad.json
diff --git a/macro_pad_apps/numpad.json b/macropad_apps/json/numpad.json
similarity index 100%
rename from macro_pad_apps/numpad.json
rename to macropad_apps/json/numpad.json
diff --git a/python_apps/__init__.py b/macropad_apps/python/__init__.py
similarity index 100%
rename from python_apps/__init__.py
rename to macropad_apps/python/__init__.py
diff --git a/python_apps/numpad.py b/macropad_apps/python/numpad.py
similarity index 100%
rename from python_apps/numpad.py
rename to macropad_apps/python/numpad.py