Refactored names for files and updated template