Split into files
Refactoring is complete