Rename templates to markup
merge