Change template directory to assets
Merge branch 'change-directory-template'