Moved files to templates
removed files moved to template