restructured templates, added new files in partials