Rename files for clarity
Improve README