Switch to including the wrapper as a sub-module