More refactoring and moving around.  All demo scripts up-to-date and ready for wiki