Patch up remaining files after reorganization - compiling and passing tests.