Update Readme and file structure