Formatted all files to match Template