Changing packages to reduce package count

Cleanup in other words