Refactor many files