removed old files; mucked about with the templates a little bit