Updated Readme
Shiv update
Update to new structure