Reorganize PurchaseOrder hierarchy