Added primary email extraction
Redirected submodules to correct(er) repos