Removed plurality from directory names.