Config reorganisation