Consistently use singular for packages which contain mixed kinds of
classes. Moved a few classes to packages that better fit them.