Initial cleanup to compile via CMakeLists