Move templates and dependencies
Merge branch 'next-refactor-templates' into next