More reorganisation work.