Do not create an unneeded directory.
Use group displayname in directory names, as before.