Construct common template directories; roll-back template names #2