Refactoring naming convention
Fixing titles
Cleaning up readme