基本结构调整

Signed-off-by: richie@walkbin <richie.wang@outlook.com>