Factor org-boundary