fix some issues with previous commits

split up large utilities to reduce change of circular imports