Modified CMakeLists to reflect other packages convention