Multiple files and refactoring