reorganised packages.
Merge branch 'master' of https://github.com/bsutton/scoutmaster.git