Move wrappers to their own package