Readme and structure changes