Move org with abbreviation logic into a helper