Cleaning up template files

- Removing extraneous template files
- Renaming list files to be more intuitive