Minor reorganisation.