Added submodules to build
Removed broken submodules