Updating readme
Cleaning up file structure