Reorganisation of the wrpper.