split classes up into sub-packages