diff --git a/doc/a2blink.map b/doc/a2blink.map
deleted file mode 100644
index 72a00d5..0000000
Binary files a/doc/a2blink.map and /dev/null differ
diff --git a/doc/a2inverse.map b/doc/a2inverse.map
deleted file mode 100644
index 70ad9ed..0000000
Binary files a/doc/a2inverse.map and /dev/null differ
diff --git a/doc/a2normal.map b/doc/a2normal.map
deleted file mode 100644
index b383772..0000000
Binary files a/doc/a2normal.map and /dev/null differ
diff --git a/doc/c64-2.oph b/doc/c64-2.oph
deleted file mode 100644
index e694c12..0000000
--- a/doc/c64-2.oph
+++ /dev/null
@@ -1,40 +0,0 @@
-.word $0801
-.org  $0801
-
-.scope
-	.word _next, 10		; Next line and current line number
-	.byte $9e," 2064",0	; SYS 2064
-_next:	.word 0			; End of program
-.scend
-
-.advance $0810
-
-.require "kernal.oph"
-
-.data zp
-.org $0002
-
-.text
-
-.scope
-	; Cache BASIC's zero page at top of available RAM.
-	ldx #$7E
-*	lda $01, x
-	sta $CF81, x
-	dex
-	bne -
-
-	jsr _main
-
-	; Restore BASIC's zero page and return control.
-
-	ldx #$7E
-*	lda $CF81, x
-	sta $01, x
-	dex
-	bne -
-	rts
-
-_main:
-	; Program follows...
-.scend
diff --git a/doc/docbook/cmdref.sgm b/doc/cmdref.sgm
similarity index 100%
rename from doc/docbook/cmdref.sgm
rename to doc/cmdref.sgm
diff --git a/doc/kernal.oph b/doc/kernal.oph
deleted file mode 100644
index ec777a8..0000000
--- a/doc/kernal.oph
+++ /dev/null
@@ -1,67 +0,0 @@
-; KERNAL routine aliases (C64)
-
-.alias acptr  $ffa5
-.alias chkin  $ffc6
-.alias chkout $ffc9
-.alias chrin  $ffcf
-.alias chrout $ffd2
-.alias ciout  $ffa8
-.alias cint   $ff81
-.alias clall  $ffe7
-.alias close  $ffc3
-.alias clrchn $ffcc
-.alias getin  $ffe4
-.alias iobase $fff3
-.alias ioinit $ff84
-.alias listen $ffb1
-.alias load   $ffd5
-.alias membot $ff9c
-.alias memtop $ff99
-.alias open   $ffc0
-.alias plot   $fff0
-.alias ramtas $ff87
-.alias rdtim  $ffde
-.alias readst $ffb7
-.alias restor $ff8a
-.alias save   $ffd8
-.alias scnkey $ff9f
-.alias screen $ffed
-.alias second $ff93
-.alias setlfs $ffba
-.alias setmsg $ff90
-.alias setnam $ffbd
-.alias settim $ffdb
-.alias settmo $ffa2
-.alias stop   $ffe1
-.alias talk   $ffb4
-.alias tksa   $ff96
-.alias udtim  $ffea
-.alias unlsn  $ffae
-.alias untlk  $ffab
-.alias vector $ff8d
-
-; Character codes for the colors.
-.alias color'0 144
-.alias color'1 5
-.alias color'2 28
-.alias color'3 159
-.alias color'4 156
-.alias color'5 30
-.alias color'6 31
-.alias color'7 158
-.alias color'8 129
-.alias color'9 149
-.alias color'10 150
-.alias color'11 151
-.alias color'12 152
-.alias color'13 153
-.alias color'14 154
-.alias color'15 155
-
-; ...and reverse video
-.alias reverse'on 18
-.alias reverse'off 146
-
-; ...and character set
-.alias upper'case 142
-.alias lower'case 14
diff --git a/doc/ophismanual.pdf b/doc/ophismanual.pdf
deleted file mode 100644
index a399c66..0000000
Binary files a/doc/ophismanual.pdf and /dev/null differ
diff --git a/doc/docbook/ophismanual.sgm b/doc/ophismanual.sgm
similarity index 100%
rename from doc/docbook/ophismanual.sgm
rename to doc/ophismanual.sgm
diff --git a/doc/docbook/preface.sgm b/doc/preface.sgm
similarity index 100%
rename from doc/docbook/preface.sgm
rename to doc/preface.sgm
diff --git a/doc/docbook/samplecode.sgm b/doc/samplecode.sgm
similarity index 100%
rename from doc/docbook/samplecode.sgm
rename to doc/samplecode.sgm
diff --git a/doc/docbook/tutor1.sgm b/doc/tutor1.sgm
similarity index 100%
rename from doc/docbook/tutor1.sgm
rename to doc/tutor1.sgm
diff --git a/doc/docbook/tutor2.sgm b/doc/tutor2.sgm
similarity index 100%
rename from doc/docbook/tutor2.sgm
rename to doc/tutor2.sgm
diff --git a/doc/docbook/tutor3.sgm b/doc/tutor3.sgm
similarity index 100%
rename from doc/docbook/tutor3.sgm
rename to doc/tutor3.sgm
diff --git a/doc/docbook/tutor4.sgm b/doc/tutor4.sgm
similarity index 100%
rename from doc/docbook/tutor4.sgm
rename to doc/tutor4.sgm
diff --git a/doc/docbook/tutor5.sgm b/doc/tutor5.sgm
similarity index 100%
rename from doc/docbook/tutor5.sgm
rename to doc/tutor5.sgm
diff --git a/doc/docbook/tutor6.sgm b/doc/tutor6.sgm
similarity index 100%
rename from doc/docbook/tutor6.sgm
rename to doc/tutor6.sgm
diff --git a/doc/docbook/tutor7.sgm b/doc/tutor7.sgm
similarity index 100%
rename from doc/docbook/tutor7.sgm
rename to doc/tutor7.sgm
diff --git a/doc/c64-1.oph b/examples/c64-1.oph
similarity index 60%
rename from doc/c64-1.oph
rename to examples/c64-1.oph
index 0a30520..53b5a52 100644
--- a/doc/c64-1.oph
+++ b/examples/c64-1.oph
@@ -3,10 +3,10 @@
 
 .scope
 	.word _next, 10		; Next line and current line number
-	.byte $9e," 2064",0	; SYS 2064
+	.byte $9e," 2062",0	; SYS 2064
 _next:	.word 0			; End of program
 .scend
 
-.advance 2064
+.advance 2062
 
-.require "kernal.oph"
+.require "../platform/c64kernal.oph"
diff --git a/doc/tutor1.oph b/examples/hello1.oph
similarity index 100%
rename from doc/tutor1.oph
rename to examples/hello1.oph
diff --git a/doc/tutor2.oph b/examples/hello2.oph
similarity index 100%
rename from doc/tutor2.oph
rename to examples/hello2.oph
diff --git a/doc/tutor3.oph b/examples/hello3.oph
similarity index 100%
rename from doc/tutor3.oph
rename to examples/hello3.oph
diff --git a/doc/tutor4a.oph b/examples/hello4a.oph
similarity index 100%
rename from doc/tutor4a.oph
rename to examples/hello4a.oph
diff --git a/doc/tutor4b.oph b/examples/hello4b.oph
similarity index 100%
rename from doc/tutor4b.oph
rename to examples/hello4b.oph
diff --git a/doc/tutor4c.oph b/examples/hello4c.oph
similarity index 100%
rename from doc/tutor4c.oph
rename to examples/hello4c.oph
diff --git a/doc/tutor5.oph b/examples/hello5.oph
similarity index 100%
rename from doc/tutor5.oph
rename to examples/hello5.oph
diff --git a/doc/tutor6.oph b/examples/hello6.oph
similarity index 100%
rename from doc/tutor6.oph
rename to examples/hello6.oph
diff --git a/doc/tutor7.oph b/examples/hello7.oph
similarity index 95%
rename from doc/tutor7.oph
rename to examples/hello7.oph
index f01506a..be2e3d6 100644
--- a/doc/tutor7.oph
+++ b/examples/hello7.oph
@@ -1,4 +1,5 @@
-.include "c64-2.oph"
+.include "../platform/c64_0.oph"
+.require "../platform/c64kernal.oph"
 
 .data
 .org $C000
diff --git a/platform/nes/demo/hello_chr.oph b/examples/hello_nes/hello_chr.oph
similarity index 100%
rename from platform/nes/demo/hello_chr.oph
rename to examples/hello_nes/hello_chr.oph
diff --git a/platform/nes/demo/hello_ines.oph b/examples/hello_nes/hello_ines.oph
similarity index 100%
rename from platform/nes/demo/hello_ines.oph
rename to examples/hello_nes/hello_ines.oph
diff --git a/platform/nes/demo/hello_prg.oph b/examples/hello_nes/hello_prg.oph
similarity index 100%
rename from platform/nes/demo/hello_prg.oph
rename to examples/hello_nes/hello_prg.oph
diff --git a/platform/nes/demo/hello_unif.oph b/examples/hello_nes/hello_unif.oph
similarity index 100%
rename from platform/nes/demo/hello_unif.oph
rename to examples/hello_nes/hello_unif.oph
diff --git a/platform/stella/demo/hi_stella.oph b/examples/hi_stella/hi_stella.oph
similarity index 98%
rename from platform/stella/demo/hi_stella.oph
rename to examples/hi_stella/hi_stella.oph
index 1d77aab..625eb5e 100644
--- a/platform/stella/demo/hi_stella.oph
+++ b/examples/hi_stella/hi_stella.oph
@@ -1,4 +1,4 @@
-.require "../stella.oph"
+.require "../../platform/stella.oph"
 .outfile "hi_stella.bin"
 
 .data
diff --git a/doc/petscii.map b/examples/petscii.map
similarity index 100%
rename from doc/petscii.map
rename to examples/petscii.map
diff --git a/platform/c64/demo/c64_hello.oph b/platform/c64/demo/c64_hello.oph
deleted file mode 100644
index 0b43fd7..0000000
--- a/platform/c64/demo/c64_hello.oph
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "../c64_0.oph"
-.include "../c64kernal.oph"
-
-.outfile "hello.prg"
-
-	ldy	#$00
-*	lda	text, y
-	beq	+
-	jsr	chrout
-	iny
-	bne	-
-*	rts
-
-text:	.byte "HELLO, C64 WORLD!", 13, 0
diff --git a/platform/c64/c64_0.oph b/platform/c64_0.oph
similarity index 100%
rename from platform/c64/c64_0.oph
rename to platform/c64_0.oph
diff --git a/platform/c64/c64kernal.oph b/platform/c64kernal.oph
similarity index 100%
rename from platform/c64/c64kernal.oph
rename to platform/c64kernal.oph
diff --git a/platform/nes/nes.oph b/platform/nes.oph
similarity index 100%
rename from platform/nes/nes.oph
rename to platform/nes.oph
diff --git a/platform/stella/stella.oph b/platform/stella.oph
similarity index 100%
rename from platform/stella/stella.oph
rename to platform/stella.oph