Unify contrib stuff a bit
Fix requirement-installer