diff --git a/demos/ClockSp b/demos/ClockSp
new file mode 100644
index 0000000..a40464e
Binary files /dev/null and b/demos/ClockSp differ
diff --git a/tests/Environ b/demos/Environ
similarity index 100%
rename from tests/Environ
rename to demos/Environ
diff --git a/demos/graphics/Circle b/demos/graphics/Circle
new file mode 100644
index 0000000..a1b8d7a
Binary files /dev/null and b/demos/graphics/Circle differ
diff --git a/demos/graphics/CircleINT b/demos/graphics/CircleINT
new file mode 100644
index 0000000..0dd001f
Binary files /dev/null and b/demos/graphics/CircleINT differ
diff --git a/demos/graphics/Clipping b/demos/graphics/Clipping
new file mode 100644
index 0000000..efc8044
Binary files /dev/null and b/demos/graphics/Clipping differ
diff --git a/tests/Creative_Graphics.po b/demos/graphics/CreativeGraphics.po
similarity index 100%
rename from tests/Creative_Graphics.po
rename to demos/graphics/CreativeGraphics.po
diff --git a/demos/graphics/Ellipse b/demos/graphics/Ellipse
new file mode 100644
index 0000000..28d888f
Binary files /dev/null and b/demos/graphics/Ellipse differ
diff --git a/demos/graphics/GCOLs b/demos/graphics/GCOLs
new file mode 100644
index 0000000..ea9e944
Binary files /dev/null and b/demos/graphics/GCOLs differ
diff --git a/demos/graphics/Graphics b/demos/graphics/Graphics
new file mode 100644
index 0000000..e7dd5ae
Binary files /dev/null and b/demos/graphics/Graphics differ
diff --git a/demos/graphics/Pixels b/demos/graphics/Pixels
new file mode 100644
index 0000000..76a6be3
Binary files /dev/null and b/demos/graphics/Pixels differ
diff --git a/tests/SNOWFLAKES#060e00 b/demos/graphics/Snowflakes
similarity index 100%
rename from tests/SNOWFLAKES#060e00
rename to demos/graphics/Snowflakes
diff --git a/demos/graphics/Spiral b/demos/graphics/Spiral
new file mode 100644
index 0000000..7c1427a
Binary files /dev/null and b/demos/graphics/Spiral differ
diff --git a/demos/graphics/x b/demos/graphics/x
deleted file mode 100644
index 8b13789..0000000
--- a/demos/graphics/x
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/KBDTest b/demos/kbd/KBDTest
similarity index 100%
rename from tests/KBDTest
rename to demos/kbd/KBDTest
diff --git a/demos/misc/8Queens b/demos/misc/8Queens
new file mode 100644
index 0000000..c3f7504
Binary files /dev/null and b/demos/misc/8Queens differ
diff --git a/demos/misc/Tiny65 b/demos/misc/Tiny65
new file mode 100644
index 0000000..a15db39
Binary files /dev/null and b/demos/misc/Tiny65 differ
diff --git a/tests/JGHMusic1.po b/demos/music/JGHMusic1.po
similarity index 100%
rename from tests/JGHMusic1.po
rename to demos/music/JGHMusic1.po
diff --git a/tests/JGHMusic2.po b/demos/music/JGHMusic2.po
similarity index 100%
rename from tests/JGHMusic2.po
rename to demos/music/JGHMusic2.po
diff --git a/tests/Shawty1.po b/demos/music/Shawty1.po
similarity index 100%
rename from tests/Shawty1.po
rename to demos/music/Shawty1.po
diff --git a/demos/vdu/Chars b/demos/vdu/Chars
new file mode 100644
index 0000000..6d5e766
Binary files /dev/null and b/demos/vdu/Chars differ
diff --git a/demos/vdu/ColourGrid b/demos/vdu/ColourGrid
new file mode 100644
index 0000000..b8a53ab
Binary files /dev/null and b/demos/vdu/ColourGrid differ
diff --git a/tests/Colours b/demos/vdu/Colours
similarity index 100%
rename from tests/Colours
rename to demos/vdu/Colours
diff --git a/demos/vdu/Cursor b/demos/vdu/Cursor
new file mode 100644
index 0000000..66dbe95
Binary files /dev/null and b/demos/vdu/Cursor differ
diff --git a/tests/MODEs b/demos/vdu/MODEs
similarity index 100%
rename from tests/MODEs
rename to demos/vdu/MODEs
diff --git a/demos/vdu/Palette b/demos/vdu/Palette
new file mode 100644
index 0000000..bd26c1a
Binary files /dev/null and b/demos/vdu/Palette differ
diff --git a/demos/vdu/TextSize b/demos/vdu/TextSize
new file mode 100644
index 0000000..a9a3600
Binary files /dev/null and b/demos/vdu/TextSize differ
diff --git a/demos/vdu/VDUVars b/demos/vdu/VDUVars
new file mode 100644
index 0000000..148034b
Binary files /dev/null and b/demos/vdu/VDUVars differ
diff --git a/demos/x b/demos/x
deleted file mode 100644
index 8b13789..0000000
--- a/demos/x
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/Pixels b/tests/Pixels
deleted file mode 100644
index 716ef91..0000000
Binary files a/tests/Pixels and /dev/null differ
diff --git a/tests/TINY65#000000 b/tests/TINY65#000000
deleted file mode 100644
index 325b143..0000000
Binary files a/tests/TINY65#000000 and /dev/null differ