Fix empty folder problems and update README.md