Reorganise packages to reflect updated design
Merge pull request #747 from rorygraves/package_structure

Reorganise packages to reflect updated design