Switch to using a submodule rather than creating on demand