diff --git a/.gitignore b/.gitignore
index d85c60a1..e3d04717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,6 @@ Icon?
 # Xcode cruft
 project.xcworkspace/
 xcuserdata/
-*.mode1
-*.mode1v3
-*.pbxuser
 
 
 # Used for downloaded code
@@ -25,7 +22,6 @@ obj.spk
 obj.win.spk
 obj.spk.dbg
 obj.win.spk.dbg
-DebugOXP/requires.plist
 AddOns/
 
 # Debug output
diff --git a/DebugOXP/Resources/debugConfig.plist b/DebugOXP/Debug.oxp/Config/debugConfig.plist
similarity index 100%
rename from DebugOXP/Resources/debugConfig.plist
rename to DebugOXP/Debug.oxp/Config/debugConfig.plist
diff --git a/DebugOXP/Resources/DebugOXPLocatorBeacon.magic b/DebugOXP/Debug.oxp/DebugOXPLocatorBeacon.magic
similarity index 100%
rename from DebugOXP/Resources/DebugOXPLocatorBeacon.magic
rename to DebugOXP/Debug.oxp/DebugOXPLocatorBeacon.magic
diff --git a/DebugOXP/Resources/oolite-debug-console.js b/DebugOXP/Debug.oxp/Scripts/oolite-debug-console.js
similarity index 100%
rename from DebugOXP/Resources/oolite-debug-console.js
rename to DebugOXP/Debug.oxp/Scripts/oolite-debug-console.js
diff --git a/DebugOXP/Debug.oxp/requires.plist b/DebugOXP/Debug.oxp/requires.plist
new file mode 100644
index 00000000..759a4291
--- /dev/null
+++ b/DebugOXP/Debug.oxp/requires.plist
@@ -0,0 +1,3 @@
+{
+    version = "1.79";
+}
diff --git a/DebugOXP/Makefile b/DebugOXP/Makefile
deleted file mode 100644
index 2f59763f..00000000
--- a/DebugOXP/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Conveniently, this here xcconfig file declares the version in a make-compatible format.
-OOLITE_VERSION_FILE = ../src/Cocoa/oolite-version.xcconfig
-include $(OOLITE_VERSION_FILE)
-
-TARGET = Basic-debug.oxp
-
-
-$(TARGET): Resources/debugConfig.plist Resources/DebugOXPLocatorBeacon.magic Resources/oolite-debug-console.js requires.plist
-	rm -rf $(TARGET)
-	mkdir $(TARGET)
-	mkdir $(TARGET)/Config
-	mkdir $(TARGET)/Scripts
-	cp Resources/debugConfig.plist $(TARGET)/Config/
-	cp Resources/DebugOXPLocatorBeacon.magic $(TARGET)/
-	cp Resources/oolite-debug-console.js $(TARGET)/Scripts/
-	cp requires.plist $(TARGET)/
-	
-requires.plist: $(OOLITE_VERSION_FILE)
-	echo "{ version = \"$(OOLITE_VERSION)\"; max_version = \"$(OOLITE_VERSION).99\"; }" > $@
-
-clean:
-	rm -rf $(TARGET)
-	rm -rf requires.plist
diff --git a/DebugOXP/Resources/debugLogMessageClassesMenu.plist b/DebugOXP/Resources/debugLogMessageClassesMenu.plist
deleted file mode 100644
index 9f1d43aa..00000000
--- a/DebugOXP/Resources/debugLogMessageClassesMenu.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-	This file defines message classes to be listed in the Log Message Classes
-	submenu of the Debug menu.
-	
-	Each entry consists of two list items. The first is the display name, the
-	name of the menu item to use. The second is the log message class or
-	metaclass the menu item should affect. These are the same keys that are
-	set in logcontrol.plist.
-	
-	Changes made using the menu are not saved between sessions.
-	
-	debugLogMessageClassesMenu.plist is merged in the usual fashion.
-*/
-
-(
-	"General Errors",				$error,
-	"Script Errors",				$scriptError,
-	"Script Debug",					$scriptDebug,
-	"Script Entry Points",			$reportScriptEntry,
-	"Shader Debug",					$shaderDebugOn,
-	"Troubleshooting Dumps",		$troubleShootingDump,
-	"Entity State",					$entityState,
-	"Data Cache Debug",				$dataCacheDebug,
-	"Rendering Errors",				"rendering.opengl.error",
-	"Texture Debug",				$textureDebug,
-	"Sound Debug",					$soundDebug
-)