Modify README for new dir structure
Clean up README file