refactor year.rb and files related to changes