Remove org constrains in prep for non-org repos
Generalize to orgs and repos