Readme
Refactor app