Split classes into two packages.