Rename tutorial files, simplify hierarchy