Move existing classes to more specific sub packages.