move subset classes to separate package. address warnings.