Refactor to DU

Change-Id: I16d9382f07c9482af85ad0670de5e529f3cd2aa6