moved templates into jst