Fixing typo in modman, moving interstitial template to twofactor subfolder