Got rid of submodules