Minor re-organisation of packages