Cleanups on the tutorials with new structure