Package reorganisation