Some cleaning up of the file structure and documentation.