Refactoring all files