Moved some files around to tidy up a bit.