moved the a couple of files to templates