restructured the xqt wrapping system to be more scalable