Fixed submodule imports