Separated client templates into a different folder
Merge branch 'adding-new-collections'