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