Attempt at proper submodule setup