Reorganize tutorials to include both 1.x and 2.x