Update readme and directory structure