Move code relevant for DPUs to the particular DPUs or common-module - 113 - clean up