Moved some files around.
Improved some bits and bobs.