Split city generation off into citygen.hpp/cpp
Fixed cmake.