diff --git a/build_bin b/build_bin
index 9ffb4eb..ca5d500 100755
--- a/build_bin
+++ b/build_bin
@@ -4,8 +4,5 @@ bin="../Bin/spinix"
 sd="${bin}/sdcard"
 flash="${bin}/flash"
 
-cd src
-bstc -b -O cgru $1.spin
-cp $1.binary ${sd}/bin/$1
-rm $1.binary
-cd ..
+bstc -b -O cgru src/$1.spin
+mv $1.binary ${sd}/bin/$1
diff --git a/build_boot b/build_boot
index 46502e3..79909e0 100755
--- a/build_boot
+++ b/build_boot
@@ -5,8 +5,5 @@ sd="${bin}/sdcard"
 flash="${bin}/flash"
 
 # Build the the boot program
-cd src
-bstc -b -O cgru boot.spin
-cp boot.binary ${flash}/
-rm boot.binary
-cd ..
+bstc -b -O cgru src/boot.spin
+mv boot.binary ${flash}/
diff --git a/build_spinix b/build_spinix
index efd68ab..4f26fc8 100755
--- a/build_spinix
+++ b/build_spinix
@@ -6,7 +6,7 @@ flash="${bin}/flash"
 
 # Clean directories and remake them
 rm -rf ${bin}
-mkdir ${bin}
+mkdir -p ${bin}
 mkdir ${sd}
 mkdir ${flash}
 mkdir ${sd}/bin
@@ -42,22 +42,16 @@ cp devel/* ${sd}/devel
 cp manpages/* ${sd}/manpages
 
 # Build lerner
-cd lerner
-cp ../src/sysdefs.spin .
-cp ../src/exit.spin .
-bstc -b -O cgru lerner.spin
-cp lerner.binary ${sd}/demos/lerner
-rm *.binary
-cd ..
+cp src/sysdefs.spin lerner/
+cp src/exit.spin lerner/
+bstc -b -O cgru lerner/lerner.spin
+mv lerner.binary ${sd}/demos/lerner
 
 # Build vga512
-cd vga512
-cp ../src/sysdefs.spin .
-cp ../src/exit.spin .
-bstc -b VGA_512x384_Bitmap_Demo.spin
-cp VGA_512x384_Bitmap_Demo.binary ${sd}/demos/vga512
-rm *.binary
-cd ..
+cp src/sysdefs.spin vga512/
+cp src/exit.spin vga512/
+bstc -b vga512/VGA_512x384_Bitmap_Demo.spin
+mv VGA_512x384_Bitmap_Demo.binary ${sd}/demos/vga512
 
 # Move vgatdemo from bin to demos
 mv ${sd}/bin/vgatdemo ${sd}/demos
@@ -74,13 +68,11 @@ mv filetest/filetest.binary ${sd}/demos/filetest
 mv chess/chess.binary ${sd}/demos/chess
 
 # Build pfth and copy the Forth files
-cd pfth
-bstc -b ospfth.spin
+bstc -b pfth/ospfth.spin
 mv ospfth.binary ${sd}/bin/pfth
-cp *.fth ${sd}/forth
-cp *.txt ${sd}/forth
+cp pfth/*.fth ${sd}/forth
+cp pfth/*.txt ${sd}/forth
 mv ${sd}/forth/_startup.fth ${sd}
-cd ..
 
 # Copy the script files
 cp scripts/* ${sd}/scripts
diff --git a/build_src b/build_src
index 8b62ed8..092a79b 100755
--- a/build_src
+++ b/build_src
@@ -59,10 +59,7 @@ cp src/spc ${sd}/bin
 cp src/*.txt ${sd}/bin
 
 # Build files for spasm
-cd src
-grep PUB clibsd.spin >${sd}/devel/clibsd.spn
+grep PUB src/clibsd.spin >${sd}/devel/clibsd.spn
 cp ${sd}/devel/clibsd.spn ${sd}/devel/clibsd.spa
-bstc -b clibsd.spin
-cp clibsd.binary ${sd}/devel/clibsd.bin
-rm clibsd.binary
-cd ..
+bstc -b src/clibsd.spin
+mv clibsd.binary ${sd}/devel/clibsd.bin