Refactored packages to fall under groupid
Cleanup in prep for release