Fixup orgs

Some small orgs refactoring