fusion3: reorganize and cleanup

Change-Id: I2390618ad34d2d3877749e75095dd00316610861