Added additional folders to classload
Fixed user pluralisation