Update Readme
Refactor scaffolding
Refactor scaffolding