Refactored organizations in upload for trails/trailheads/segments.