Moved template files into template folder