Clean up directories and update README