Updated folder names
Removed old folders