Still working on setting up the CMake build system. Cleaned up some code for header file selection