Some renaming, some moving, some documentation.
Put in a fix for #80, I have found it doesn't make a difference in speed though.