Trying to make flat submodule structure