Whoops, broke the Cmake build again

Cleaned up some merge conflicts and moved a few things around, should
build but I don't have access to a build system currently