tutorial reorganized