Core reorganisation