Improve the structure

Signed-off-by: Xiaofeng QU <xiaofeng.qu.hk@ieee.org>