- Fix minor bug & remove old folders
- Clean