restructure for cargo