Corrected CMake to reflect new dir structure