Update readme and file structure