removed pluralization from the folder names