Refactoring of files