大规模重构第二弹

Signed-off-by: MagicHu <huweimin@cn.ibm.com>