Rename some files for clarity.
improve the readme a bit