Updated to new folder names.