Major shift to split into sub-packages