Continued multi-file refactoring