I'm not sure it's worth it. Organization-specific code is only ever going to be used in one place, and moving it into the module won't make the code easier to understand, only easier to locate. 
Organization is a prime example of one-off corner case, so I decided to treat it as such. I'd agree with you had organization-specific logic been used in more than one place.