Updated folder names