Minor reorganisation of the physics package.