Move some classes to new subpackages.