ditching the submodules - too complicated!