refactored CMakeLists to add headers for VS sol