Updated folder names for correct singular/plural