Make code and comments more readable
Add current year to all file names for context