diff --git a/Makefile b/Makefile
index 942c831..152051a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,10 @@ OBJS	= armc-start.o armc-cstartup.o armc-cstubs.o armc-cppstubs.o \
 	Drive.o gcr.o prot.o lz.o emmc.o diskio.o options.o Screen.o \
 	Timer.o FileBrowser.o DiskCaddy.o ROMs.o InputMappings.o xga_font_data.o
 
-LIBS    = uspi/lib/libuspi.a
+SRCDIR   = src
+OBJS    := $(addprefix $(SRCDIR)/, $(OBJS))
+
+LIBS     = uspi/libuspi.a
 INCLUDE  = -Iuspi/include/
 
 TARGET  ?= kernel
@@ -20,12 +23,11 @@ $(TARGET): $(OBJS) $(LIBS)
 	$(Q)$(PREFIX)objdump -d $(TARGET).elf | $(PREFIX)c++filt > $(TARGET).lst
 	$(Q)$(PREFIX)objcopy $(TARGET).elf -O binary $(TARGET).img
 
-uspi/lib/libuspi.a:
-	$(MAKE) -C uspi/lib
+uspi/libuspi.a:
+	$(MAKE) -C uspi
 
-clean: clean_libs
-
-clean_libs:
-	$(MAKE) -C uspi/lib clean
+clean:
+	$(Q)$(RM) $(OBJS) $(TARGET).elf $(TARGET).map $(TARGET).lst $(TARGET).img
+	$(MAKE) -C uspi clean
 
 include Makefile.rules
\ No newline at end of file
diff --git a/Makefile.rules b/Makefile.rules
index 1527e09..241686e 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1,4 +1,4 @@
-# To show build commands: make
+# To show build commands: make V=1
 ifneq ($(V),1)
 Q		:= @
 endif
@@ -45,7 +45,4 @@ CFLAGS	 += -fno-delete-null-pointer-checks -fdata-sections -ffunction-sections -
 
 %.o: %.cpp
 	@echo "  CPP  $@"
-	$(Q)$(CPP) $(CPPFLAGS) $(INCLUDE) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.elf *.lst *.img *.map
\ No newline at end of file
+	$(Q)$(CPP) $(CPPFLAGS) $(INCLUDE) -c -o $@ $<
\ No newline at end of file
diff --git a/font b/font
deleted file mode 100644
index 191ac46..0000000
Binary files a/font and /dev/null differ
diff --git a/CBMFont.h b/src/CBMFont.h
similarity index 100%
rename from CBMFont.h
rename to src/CBMFont.h
diff --git a/DiskCaddy.cpp b/src/DiskCaddy.cpp
similarity index 100%
rename from DiskCaddy.cpp
rename to src/DiskCaddy.cpp
diff --git a/DiskCaddy.h b/src/DiskCaddy.h
similarity index 100%
rename from DiskCaddy.h
rename to src/DiskCaddy.h
diff --git a/DiskImage.cpp b/src/DiskImage.cpp
similarity index 100%
rename from DiskImage.cpp
rename to src/DiskImage.cpp
diff --git a/DiskImage.h b/src/DiskImage.h
similarity index 100%
rename from DiskImage.h
rename to src/DiskImage.h
diff --git a/Drive.cpp b/src/Drive.cpp
similarity index 100%
rename from Drive.cpp
rename to src/Drive.cpp
diff --git a/Drive.h b/src/Drive.h
similarity index 100%
rename from Drive.h
rename to src/Drive.h
diff --git a/FileBrowser.cpp b/src/FileBrowser.cpp
similarity index 100%
rename from FileBrowser.cpp
rename to src/FileBrowser.cpp
diff --git a/FileBrowser.h b/src/FileBrowser.h
similarity index 100%
rename from FileBrowser.h
rename to src/FileBrowser.h
diff --git a/IOPort.h b/src/IOPort.h
similarity index 100%
rename from IOPort.h
rename to src/IOPort.h
diff --git a/InputMappings.cpp b/src/InputMappings.cpp
similarity index 100%
rename from InputMappings.cpp
rename to src/InputMappings.cpp
diff --git a/InputMappings.h b/src/InputMappings.h
similarity index 100%
rename from InputMappings.h
rename to src/InputMappings.h
diff --git a/Keyboard.cpp b/src/Keyboard.cpp
similarity index 100%
rename from Keyboard.cpp
rename to src/Keyboard.cpp
diff --git a/Keyboard.h b/src/Keyboard.h
similarity index 100%
rename from Keyboard.h
rename to src/Keyboard.h
diff --git a/Petscii.h b/src/Petscii.h
similarity index 100%
rename from Petscii.h
rename to src/Petscii.h
diff --git a/Pi1541.cpp b/src/Pi1541.cpp
similarity index 100%
rename from Pi1541.cpp
rename to src/Pi1541.cpp
diff --git a/Pi1541.h b/src/Pi1541.h
similarity index 100%
rename from Pi1541.h
rename to src/Pi1541.h
diff --git a/ROMs.cpp b/src/ROMs.cpp
similarity index 100%
rename from ROMs.cpp
rename to src/ROMs.cpp
diff --git a/ROMs.h b/src/ROMs.h
similarity index 100%
rename from ROMs.h
rename to src/ROMs.h
diff --git a/Screen.cpp b/src/Screen.cpp
similarity index 100%
rename from Screen.cpp
rename to src/Screen.cpp
diff --git a/Screen.h b/src/Screen.h
similarity index 100%
rename from Screen.h
rename to src/Screen.h
diff --git a/Singleton.h b/src/Singleton.h
similarity index 100%
rename from Singleton.h
rename to src/Singleton.h
diff --git a/Timer.c b/src/Timer.c
similarity index 100%
rename from Timer.c
rename to src/Timer.c
diff --git a/Timer.h b/src/Timer.h
similarity index 100%
rename from Timer.h
rename to src/Timer.h
diff --git a/armc-cppstubs.cpp b/src/armc-cppstubs.cpp
similarity index 100%
rename from armc-cppstubs.cpp
rename to src/armc-cppstubs.cpp
diff --git a/armc-cstartup.c b/src/armc-cstartup.c
similarity index 100%
rename from armc-cstartup.c
rename to src/armc-cstartup.c
diff --git a/armc-cstubs.c b/src/armc-cstubs.c
similarity index 100%
rename from armc-cstubs.c
rename to src/armc-cstubs.c
diff --git a/armc-start.S b/src/armc-start.S
similarity index 100%
rename from armc-start.S
rename to src/armc-start.S
diff --git a/bcm2835int.h b/src/bcm2835int.h
similarity index 100%
rename from bcm2835int.h
rename to src/bcm2835int.h
diff --git a/cache.c b/src/cache.c
similarity index 100%
rename from cache.c
rename to src/cache.c
diff --git a/cache.h b/src/cache.h
similarity index 100%
rename from cache.h
rename to src/cache.h
diff --git a/debug.h b/src/debug.h
similarity index 100%
rename from debug.h
rename to src/debug.h
diff --git a/defs.h b/src/defs.h
similarity index 100%
rename from defs.h
rename to src/defs.h
diff --git a/diskio.cpp b/src/diskio.cpp
similarity index 100%
rename from diskio.cpp
rename to src/diskio.cpp
diff --git a/diskio.h b/src/diskio.h
similarity index 100%
rename from diskio.h
rename to src/diskio.h
diff --git a/emmc.cpp b/src/emmc.cpp
similarity index 100%
rename from emmc.cpp
rename to src/emmc.cpp
diff --git a/emmc.h b/src/emmc.h
similarity index 100%
rename from emmc.h
rename to src/emmc.h
diff --git a/exception.c b/src/exception.c
similarity index 100%
rename from exception.c
rename to src/exception.c
diff --git a/ff.cpp b/src/ff.cpp
similarity index 100%
rename from ff.cpp
rename to src/ff.cpp
diff --git a/ff.h b/src/ff.h
similarity index 100%
rename from ff.h
rename to src/ff.h
diff --git a/ffconf.h b/src/ffconf.h
similarity index 100%
rename from ffconf.h
rename to src/ffconf.h
diff --git a/gcr.cpp b/src/gcr.cpp
similarity index 100%
rename from gcr.cpp
rename to src/gcr.cpp
diff --git a/gcr.h b/src/gcr.h
similarity index 100%
rename from gcr.h
rename to src/gcr.h
diff --git a/iec_bus.cpp b/src/iec_bus.cpp
similarity index 100%
rename from iec_bus.cpp
rename to src/iec_bus.cpp
diff --git a/iec_bus.h b/src/iec_bus.h
similarity index 100%
rename from iec_bus.h
rename to src/iec_bus.h
diff --git a/iec_commands.cpp b/src/iec_commands.cpp
similarity index 100%
rename from iec_commands.cpp
rename to src/iec_commands.cpp
diff --git a/iec_commands.h b/src/iec_commands.h
similarity index 100%
rename from iec_commands.h
rename to src/iec_commands.h
diff --git a/integer.h b/src/integer.h
similarity index 100%
rename from integer.h
rename to src/integer.h
diff --git a/interrupt.c b/src/interrupt.c
similarity index 100%
rename from interrupt.c
rename to src/interrupt.c
diff --git a/interrupt.h b/src/interrupt.h
similarity index 100%
rename from interrupt.h
rename to src/interrupt.h
diff --git a/kernel.h b/src/kernel.h
similarity index 100%
rename from kernel.h
rename to src/kernel.h
diff --git a/logo.h b/src/logo.h
similarity index 100%
rename from logo.h
rename to src/logo.h
diff --git a/lz.c b/src/lz.c
similarity index 100%
rename from lz.c
rename to src/lz.c
diff --git a/lz.h b/src/lz.h
similarity index 100%
rename from lz.h
rename to src/lz.h
diff --git a/m6502.cpp b/src/m6502.cpp
similarity index 100%
rename from m6502.cpp
rename to src/m6502.cpp
diff --git a/m6502.h b/src/m6502.h
similarity index 100%
rename from m6502.h
rename to src/m6502.h
diff --git a/m6522.cpp b/src/m6522.cpp
similarity index 100%
rename from m6522.cpp
rename to src/m6522.cpp
diff --git a/m6522.h b/src/m6522.h
similarity index 100%
rename from m6522.h
rename to src/m6522.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/options.cpp b/src/options.cpp
similarity index 100%
rename from options.cpp
rename to src/options.cpp
diff --git a/options.h b/src/options.h
similarity index 100%
rename from options.h
rename to src/options.h
diff --git a/prot.cpp b/src/prot.cpp
similarity index 100%
rename from prot.cpp
rename to src/prot.cpp
diff --git a/prot.h b/src/prot.h
similarity index 100%
rename from prot.h
rename to src/prot.h
diff --git a/rpi-aux.c b/src/rpi-aux.c
similarity index 100%
rename from rpi-aux.c
rename to src/rpi-aux.c
diff --git a/rpi-aux.h b/src/rpi-aux.h
similarity index 100%
rename from rpi-aux.h
rename to src/rpi-aux.h
diff --git a/rpi-base.h b/src/rpi-base.h
similarity index 100%
rename from rpi-base.h
rename to src/rpi-base.h
diff --git a/rpi-gpio.c b/src/rpi-gpio.c
similarity index 100%
rename from rpi-gpio.c
rename to src/rpi-gpio.c
diff --git a/rpi-gpio.h b/src/rpi-gpio.h
similarity index 100%
rename from rpi-gpio.h
rename to src/rpi-gpio.h
diff --git a/rpi-interrupts.c b/src/rpi-interrupts.c
similarity index 100%
rename from rpi-interrupts.c
rename to src/rpi-interrupts.c
diff --git a/rpi-interrupts.h b/src/rpi-interrupts.h
similarity index 100%
rename from rpi-interrupts.h
rename to src/rpi-interrupts.h
diff --git a/rpi-mailbox-interface.c b/src/rpi-mailbox-interface.c
similarity index 100%
rename from rpi-mailbox-interface.c
rename to src/rpi-mailbox-interface.c
diff --git a/rpi-mailbox-interface.h b/src/rpi-mailbox-interface.h
similarity index 100%
rename from rpi-mailbox-interface.h
rename to src/rpi-mailbox-interface.h
diff --git a/rpi-mailbox.c b/src/rpi-mailbox.c
similarity index 100%
rename from rpi-mailbox.c
rename to src/rpi-mailbox.c
diff --git a/rpi-mailbox.h b/src/rpi-mailbox.h
similarity index 100%
rename from rpi-mailbox.h
rename to src/rpi-mailbox.h
diff --git a/rpiHardware.h b/src/rpiHardware.h
similarity index 100%
rename from rpiHardware.h
rename to src/rpiHardware.h
diff --git a/sample.h b/src/sample.h
similarity index 100%
rename from sample.h
rename to src/sample.h
diff --git a/startup.h b/src/startup.h
similarity index 100%
rename from startup.h
rename to src/startup.h
diff --git a/stb_image.h b/src/stb_image.h
similarity index 100%
rename from stb_image.h
rename to src/stb_image.h
diff --git a/stb_image_config.h b/src/stb_image_config.h
similarity index 100%
rename from stb_image_config.h
rename to src/stb_image_config.h
diff --git a/types.h b/src/types.h
similarity index 100%
rename from types.h
rename to src/types.h
diff --git a/xga_font_data.c b/src/xga_font_data.c
similarity index 100%
rename from xga_font_data.c
rename to src/xga_font_data.c
diff --git a/xga_font_data.h b/src/xga_font_data.h
similarity index 100%
rename from xga_font_data.h
rename to src/xga_font_data.h
diff --git a/uspi/lib/Makefile b/uspi/Makefile
similarity index 84%
rename from uspi/lib/Makefile
rename to uspi/Makefile
index 63011c5..b541fd6 100644
--- a/uspi/lib/Makefile
+++ b/uspi/Makefile
@@ -27,12 +27,19 @@ OBJS	= uspilibrary.o \
 	  dwhcirootport.o usbmouse.o \
 	  dwhciframeschednsplit.o usbgamepad.o synchronize.o usbstring.o usbmidi.o
 
-INCLUDE = -I../include
+SRCDIR  = lib
+OBJS   := $(addprefix $(SRCDIR)/, $(OBJS))
 
-all: libuspi.a
+TARGET  = libuspi
+INCLUDE = -Iinclude
 
-libuspi.a: $(OBJS)
+all: $(TARGET).a
+
+$(TARGET).a: $(OBJS)
 	@echo "  LINK $@"
-	$(Q)$(AR) cr libuspi.a $(OBJS)
+	$(Q)$(AR) cr $(TARGET).a $(OBJS)
 
-include ../../Makefile.rules
\ No newline at end of file
+clean:
+	$(Q)$(RM) $(OBJS) $(TARGET).a
+
+include ../Makefile.rules
\ No newline at end of file