Clean up the package definitions
Further disentangle the main/test packages