Refactor into fewer files