diff --git a/beebtrk.6502 b/beebtrk.6502
index f514137..51e18ec 100644
--- a/beebtrk.6502
+++ b/beebtrk.6502
@@ -6,7 +6,7 @@
 \ ******************************************************************
 
 \\ Common global defines
-INCLUDE "bbc.h.6502"
+INCLUDE "lib/bbc.h.6502"
 
 \ ******************************************************************
 \ *	Define compilation flags
@@ -44,9 +44,9 @@ GUARD &9F							; user ZP + econet ZP
 
 
 \\ Any includes here can declare ZP vars from the pool using SKIP
-INCLUDE "exomiser.h.6502"
-INCLUDE "vgmplayer.h.6502"
-INCLUDE "beebtracker.h.6502"
+INCLUDE "lib/exomiser.h.6502"
+INCLUDE "lib/vgmplayer.h.6502"
+INCLUDE "lib/beebtracker.h.6502"
 
 
 
@@ -64,9 +64,9 @@ GUARD MODE7_base_addr				; ensure code size doesn't hit start of screen memory
 \ *	Code entry
 \ ******************************************************************
 
-INCLUDE "exomiser.s.6502"
-INCLUDE "vgmplayer.s.6502"
-INCLUDE "beebtracker.s.6502"
+INCLUDE "lib/exomiser.s.6502"
+INCLUDE "lib/vgmplayer.s.6502"
+INCLUDE "lib/beebtracker.s.6502"
 
 \ ******************************************************************
 \ *	Main loop including high-level state machine
diff --git a/bbc.h.6502 b/lib/bbc.h.6502
similarity index 100%
rename from bbc.h.6502
rename to lib/bbc.h.6502
diff --git a/beebtracker.h.6502 b/lib/beebtracker.h.6502
similarity index 100%
rename from beebtracker.h.6502
rename to lib/beebtracker.h.6502
diff --git a/beebtracker.s.6502 b/lib/beebtracker.s.6502
similarity index 100%
rename from beebtracker.s.6502
rename to lib/beebtracker.s.6502
diff --git a/exomiser.h.6502 b/lib/exomiser.h.6502
similarity index 100%
rename from exomiser.h.6502
rename to lib/exomiser.h.6502
diff --git a/exomiser.s.6502 b/lib/exomiser.s.6502
similarity index 100%
rename from exomiser.s.6502
rename to lib/exomiser.s.6502
diff --git a/vgmplayer.h.6502 b/lib/vgmplayer.h.6502
similarity index 100%
rename from vgmplayer.h.6502
rename to lib/vgmplayer.h.6502
diff --git a/vgmplayer.s.6502 b/lib/vgmplayer.s.6502
similarity index 100%
rename from vgmplayer.s.6502
rename to lib/vgmplayer.s.6502