moved all templates from tavern/templates to tavern/templates/tavern/ and made necessary changes in the templates