Move *_new_wrap() functions to public API modules