CMakeLists files updated to include reference both .cpp and .h files, so they can be part of the project and therefore searchable.