|#536 | +Balvinder | Refactoring, moving Order to shipment module, building dependencies accordingly