updated to new submodule structure