Fix repository organization method

I'm going to add some non-env repo tests. I can add them in a separate PR though if anyone needs this right away.