Moving so sub-packages to breakup the tests a bit