Start of large package re-organization, so that the growing number of
classes and tests we have become easier to discover, and are better
organized (time-boxed activity, which will have to be progressed further
at some other time).