Made changes to import statements to correct error with switch to CMake