Refactor some files
Refactor concerns
Write README