Refactored code into new files and structures.
:w