Class reorganisation