Changing to single line architecture