Update and rename generator to generator+solver