Moved template files into the right place!