Refactoring for recent years
Adding files to clobber clean path