renamed folders to plural