Cleanup, migrating to proper cmakelists
Subsequent cleanup...