diff --git a/Building.txt b/Building.txt
index 6dabb63..1da2490 100644
--- a/Building.txt
+++ b/Building.txt
@@ -3,9 +3,14 @@ The Build folder contains custom made project files for Visual Studio 2010 and X
 To build for the QNX platform on Windows, run cmd.exe and execute the following commands:
 > cd [bbndk]				where [bbndk] is where the QNX NDK was installed (i.e. C:\bbndk)
 > NativeSDK-env.bat
-> cd [box2d]				where [box2d] is the directory where Box2D was extracted to
+> cd [box2d]/qnx			where [box2d] is the directory where Box2D was extracted to
 > make
-Following this, the relevant binaries should reside in the arm/ subdirectory.
+Following this, the relevant binaries should reside in the following subdirectories:
+    libBox2D: 
+        [box2d]/qnx/arm/a.le.v7      (ARM release)
+        [box2d]/qnx/arm/a.le.v7.g    (ARM debug)
+        [box2d]/qnx/x86/a            (x86 release)
+        [box2d]/qnx/x86/a.g          (x86 simulator debug)
 
 For other platforms you need to run premake in this directory. You can get premake here:
 http://industriousone.com/premake
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 7269988..0000000
--- a/common.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-ifndef QCONFIG
-QCONFIG=qconfig.mk
-endif
-include $(QCONFIG)
-
-NAME=Box2D
-
-#===== CCFLAGS - add the flags to the C compiler command line. 
-CCFLAGS+=-Y_gpp
-
-#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
-EXTRA_SRCVPATH+=$(PROJECT_ROOT)/Box2D/Collision  \
-	$(PROJECT_ROOT)/Box2D/Collision/Shapes  \
-	$(PROJECT_ROOT)/Box2D/Common  \
-	$(PROJECT_ROOT)/Box2D/Dynamics  \
-	$(PROJECT_ROOT)/Box2D/Dynamics/Contacts  \
-	$(PROJECT_ROOT)/Box2D/Dynamics/Joints  \
-	$(PROJECT_ROOT)/Box2D/Rope
-
-include $(MKFILES_ROOT)/qtargets.mk
-
-OPTIMIZE_TYPE_g=none
-OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
\ No newline at end of file
diff --git a/Makefile b/qnx/Makefile
similarity index 100%
rename from Makefile
rename to qnx/Makefile
diff --git a/arm/Makefile b/qnx/arm/Makefile
similarity index 94%
rename from arm/Makefile
rename to qnx/arm/Makefile
index 6a18617..0e22650 100644
--- a/arm/Makefile
+++ b/qnx/arm/Makefile
@@ -1,8 +1,8 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
diff --git a/arm/a-le-v7-g/Makefile b/qnx/arm/a.le.v7.g/Makefile
similarity index 96%
rename from arm/a-le-v7-g/Makefile
rename to qnx/arm/a.le.v7.g/Makefile
index cc39927..2c76089 100644
--- a/arm/a-le-v7-g/Makefile
+++ b/qnx/arm/a.le.v7.g/Makefile
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
diff --git a/arm/a-le-v7/Makefile b/qnx/arm/a.le.v7/Makefile
similarity index 96%
rename from arm/a-le-v7/Makefile
rename to qnx/arm/a.le.v7/Makefile
index cc39927..2c76089 100644
--- a/arm/a-le-v7/Makefile
+++ b/qnx/arm/a.le.v7/Makefile
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
diff --git a/qnx/common.mk b/qnx/common.mk
new file mode 100644
index 0000000..22447cb
--- /dev/null
+++ b/qnx/common.mk
@@ -0,0 +1,26 @@
+ifndef QCONFIG
+QCONFIG=qconfig.mk
+endif
+include $(QCONFIG)
+
+NAME=Box2D
+
+#===== CCFLAGS - add the flags to the C compiler command line. 
+CCFLAGS+=-Y_gpp
+
+#===== EXTRA_INCVPATH - a space-separated list of directories to search for include files.
+EXTRA_INCVPATH+=$(PRODUCT_ROOT)
+
+#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
+EXTRA_SRCVPATH+=$(PRODUCT_ROOT)/Box2D/Collision  \
+	$(PRODUCT_ROOT)/Box2D/Collision/Shapes  \
+	$(PRODUCT_ROOT)/Box2D/Common  \
+	$(PRODUCT_ROOT)/Box2D/Dynamics  \
+	$(PRODUCT_ROOT)/Box2D/Dynamics/Contacts  \
+	$(PRODUCT_ROOT)/Box2D/Dynamics/Joints  \
+	$(PRODUCT_ROOT)/Box2D/Rope
+
+include $(MKFILES_ROOT)/qtargets.mk
+
+OPTIMIZE_TYPE_g=none
+OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
\ No newline at end of file
diff --git a/qnx/x86/Makefile b/qnx/x86/Makefile
new file mode 100644
index 0000000..0e22650
--- /dev/null
+++ b/qnx/x86/Makefile
@@ -0,0 +1,8 @@
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
diff --git a/qnx/x86/a.g/Makefile b/qnx/x86/a.g/Makefile
new file mode 100644
index 0000000..2c76089
--- /dev/null
+++ b/qnx/x86/a.g/Makefile
@@ -0,0 +1 @@
+include ../../common.mk
diff --git a/qnx/x86/a/Makefile b/qnx/x86/a/Makefile
new file mode 100644
index 0000000..2c76089
--- /dev/null
+++ b/qnx/x86/a/Makefile
@@ -0,0 +1 @@
+include ../../common.mk