继续调整代码结构

Signed-off-by: hurley25 <liuhuan1992@gmail.com>