Major refactor of CMake files!