Directory restructuring for tutorials
Fixes for tutorials.  Refactoring.
Merge pull request #16 from floralvikings/master

Merge master into develop