Removed bugged submodules
Added submodules