Reorganised packages to better describe functionality.