Refactor in multiple files