Update Readme and rearrange file structure