Breaking up the Common package. Some of this will get recombined later.