Refactored organizations repo