调整命名空间，更简洁

Signed-off-by: XuTongle <xutongle@gmail.com>