readded submodules correctly (i hope)