Experiment with getting rid of submodules