Clean up directory structure and update README.txt.