Add async submodule, better handling contrib dir