Rename and move template files for the sake of naming