diff --git a/joeylib/build.sh b/joeylib/build.sh
index e04d37c..21e2f54 100755
--- a/joeylib/build.sh
+++ b/joeylib/build.sh
@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/bin/bash -e
+
+#***TODO*** Move "installed" into SDKs folders
 
 # Amiga
 # https://github.com/bebbo/amiga-gcc
@@ -135,7 +137,7 @@ function doIIgsBuild() {
 
 function doPCBuild() {
 
-	local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -c"
+	local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -I${INSTALLED}/include -c"
 
 	echo "*** Starting ${DIST}"
 	createBuildAndDist
@@ -143,9 +145,9 @@ function doPCBuild() {
 	pushd "${BUILD}"
 	"${CC}" ${CFLAGS} ${G_CFLAGS} -o jPC.o "${SRC}/jPC.c"
 	"${CC}" ${CFLAGS} ${G_CFLAGS} -o joey.o "${SRC}/joey.c"
-	ar x "${INSTALLED}/libSDL2.a"
-	ar x "${INSTALLED}/libSDL2_mixer.a"
-	ar x "${INSTALLED}/libmodplug.a"
+	ar x "${INSTALLED}/lib/libSDL2.a"
+	ar x "${INSTALLED}/lib/libSDL2_mixer.a"
+	ar x "${INSTALLED}/lib/libmodplug.a"
 	ar rcs "${DIST}/libjoeylib.a" *.o
 	popd
 
@@ -193,7 +195,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "linux64x" ]]; then
 	CFLAGS=""
 	LDFLAGS=""
 	DIST="${JOEY}/dist/linux/x64"
-	INSTALLED="${DEPS}/linux/x64/lib"
+	INSTALLED="${DEPS}/linux/x64"
 	doPCBuild
 fi
 
@@ -202,7 +204,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "linux32x" ]]; then
 	CFLAGS="-m32"
 	LDFLAGS=""
 	DIST="${JOEY}/dist/linux/i386"
-	INSTALLED="${DEPS}/linux/i386/lib"
+	INSTALLED="${DEPS}/linux/i386"
 	doPCBuild
 fi
 
@@ -210,8 +212,8 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "macos32x" ]]; then
 	CC="o32-clang"
 	CFLAGS=""
 	LDFLAGS=""
-	DIST="${JOEY}/dist/macos/i386"
-	INSTALLED="${DEPS}/macos/i386/lib"
+	DIST="${JOEY}/dist/macOS/i386"
+	INSTALLED="${DEPS}/macOS/i386"
 	doPCBuild
 fi
 
@@ -219,8 +221,8 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "macos64x" ]]; then
 	CC="o64-clang"
 	CFLAGS=""
 	LDFLAGS=""
-	DIST="${JOEY}/dist/macos/x64"
-	INSTALLED="${DEPS}/macos/x64/lib"
+	DIST="${JOEY}/dist/macOS/x64"
+	INSTALLED="${DEPS}/macOS/x64"
 	doPCBuild
 fi
 
@@ -245,7 +247,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "windows64x" ]]; then
 	CFLAGS=""
 	LDFLAGS=""
 	DIST="${JOEY}/dist/windows/x64"
-	INSTALLED="${DEPS}/windows/x64/lib"
+	INSTALLED="${DEPS}/windows/x64"
 	doPCBuild
 fi
 
@@ -254,7 +256,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "windows32x" ]]; then
 	CFLAGS=""
 	LDFLAGS=""
 	DIST="${JOEY}/dist/windows/i386"
-	INSTALLED="${DEPS}/windows/i386/lib"
+	INSTALLED="${DEPS}/windows/i386"
 	doPCBuild
 fi
 
diff --git a/scripts/installer.sh b/scripts/installer.sh
index cd45a04..478673d 100755
--- a/scripts/installer.sh
+++ b/scripts/installer.sh
@@ -922,6 +922,8 @@ function start() {
 G_PARENT=$(pwd)
 G_SCRIPT=$(basename -- "$0")
 
+export JOEY=${G_PARENT}
+
 # Is SUDO after us?
 if [[ "$1" == "ASKPASS" ]]; then
 	doSudoAskPass