Lots of moving. Focused on individual function files. More reorg.
Removing files.