cleaned up the folder names