Integrate tutorials, reorganize generated output a little