minor refactorings in preparation for change of core
change dupe tutorial files