Minor cleanup - package reorganisation