clean up folder structure and update readme