Moved templates and changed to jst, wraping up issue #2