Organizing for first tut release

Updated Master branch with current system as implemented on my server.