Abandoned the submodules idea