Merge
change route of templates moving them to asserts