a bit of reorganisation