refactor maestro and split it into gaudi & container collection