Cleaned up a load of the demo classes
Mostly renaming, minimising accessibility, making things static where they can be

Signed-off-by: Martin Evans <martindevans@gmail.com>