more work on proper packages
Merge branch 'master' of https://github.com/andrewchambers/g