Updated CMakeLists due to the addition of types.hpp