diff --git a/GNUmakefile b/GNUmakefile
index 0b52d40e..0865af02 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,9 +32,9 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
     endif
 else
     ifeq ($(debug),yes)
-        LIBJS_ROOT               = deps/mozilla/js/src/build-debug
+        LIBJS_ROOT               = ../spidermonkey-ff4/js/src/build-debug
     else
-        LIBJS_ROOT               = deps/mozilla/js/src/build-release
+        LIBJS_ROOT               = ../spidermonkey-ff4/js/src/build-release
     endif
     LIBJS_INC_DIR                = $(LIBJS_ROOT)/dist/include
     LIBJS_LIB_DIR                = $(LIBJS_ROOT)/dist/lib
diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble
index c386ea07..ca3360a1 100644
--- a/GNUmakefile.postamble
+++ b/GNUmakefile.postamble
@@ -32,18 +32,18 @@ after-all::
 	$(CP) $(CP_FLAGS) Resources/Config $(PROGDIR)/Resources
 	$(CP) $(CP_FLAGS) Resources/Scripts $(PROGDIR)/Resources
 	$(CP) $(CP_FLAGS) Resources/Shaders $(PROGDIR)/Resources
-	$(CP) $(CP_FLAGS) Resources/Binary/Images $(PROGDIR)/Resources
-	$(CP) $(CP_FLAGS) Resources/Binary/Models $(PROGDIR)/Resources
-	$(CP) $(CP_FLAGS) Resources/Binary/Music $(PROGDIR)/Resources
-	$(CP) $(CP_FLAGS) Resources/Binary/Sounds $(PROGDIR)/Resources
-	$(CP) $(CP_FLAGS) Resources/Binary/Textures $(PROGDIR)/Resources
+	$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Images $(PROGDIR)/Resources
+	$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Models $(PROGDIR)/Resources
+	$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Music $(PROGDIR)/Resources
+	$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Sounds $(PROGDIR)/Resources
+	$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Textures $(PROGDIR)/Resources
 	$(CP) $(CP_FLAGS) Schemata $(PROGDIR)/Resources
 ifeq ($(ESPEAK),yes)
     ifeq ($(GNUSTEP_HOST_OS),mingw32)
 		$(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
     else
         ifeq ($(use_deps),yes)
-			$(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
+			$(CP) $(CP_FLAGS) ../oolite-sdl-dependencies/espeak-data $(PROGDIR)/Resources
         endif
     endif
 endif
diff --git a/installers/posix/make_installer.sh b/installers/posix/make_installer.sh
index 6edaddf3..0042cf6c 100755
--- a/installers/posix/make_installer.sh
+++ b/installers/posix/make_installer.sh
@@ -80,25 +80,25 @@ cd installers/
 tar zcf ../${setup_root}/freedesktop.tar.gz FreeDesktop/ --exclude .svn
 
 echo "Packing $cpu_architecture architecture library dependencies..."
-cd ../deps/Linux-deps/${cpu_architecture}/
-tar zcf ../../../${setup_root}/oolite.deps.tar.gz lib/ --exclude .svn
+cd ../../oolite-linux-dependencies/${cpu_architecture}/
+tar zcf ../../oolite/${setup_root}/oolite.deps.tar.gz lib/ --exclude .svn
 
 echo "Packing documentation..."
-cd ../../../Doc/
+cd ../../oolite/Doc/
 tar cf ../${setup_root}/oolite.doc.tar AdviceForNewCommanders.pdf OoliteReadMe.pdf OoliteRS.pdf CHANGELOG.TXT
-cd ../deps/Linux-deps/
-tar rf ../../${setup_root}/oolite.doc.tar README.TXT
-gzip ../../${setup_root}/oolite.doc.tar
+cd ../../oolite-linux-dependencies/
+tar rf ../oolite/${setup_root}/oolite.doc.tar README.TXT
+gzip ../oolite/${setup_root}/oolite.doc.tar
 
 echo "Packing wrapper scripts and startup README..."
-tar zcf ../../${setup_root}/oolite.wrap.tar.gz oolite.src oolite-update.src 
+tar zcf ../oolite/${setup_root}/oolite.wrap.tar.gz oolite.src oolite-update.src 
 
 echo "Packing GNUstep DTDs..."
-cd ../Cross-platform-deps/
-tar zcf ../../${setup_root}/oolite.dtd.tar.gz DTDs --exclude .svn
+cd ../oolite-sdl-dependencies/
+tar zcf ../oolite/${setup_root}/oolite.dtd.tar.gz DTDs --exclude .svn
 
 echo "Copying setup script..."
-cd ../../installers/posix/
+cd ../oolite/installers/posix/
 cat setup.header > ../../${oolite_app}/setup
 if [ $trunk ] 
 then
diff --git a/libjs.make b/libjs.make
index 55334b8f..355d29f8 100644
--- a/libjs.make
+++ b/libjs.make
@@ -11,7 +11,7 @@
 
 include config.make
 
-LIBJS_SRC_DIR                    = deps/mozilla/js/src
+LIBJS_SRC_DIR                    = ../spidermonkey-ff4/js/src
 LIBJS_CONFIG_FLAGS               = --disable-shared-js
 LIBJS_CONFIG_FLAGS               += --enable-threadsafe
 LIBJS_CONFIG_FLAGS               += --with-system-nspr