Refactoring to multiple files