Clean up code
Reorganize into separate files
Finish reorganization