File cleanups for CMake conversion
Initial CMake support