trival re-org

Signed-off-by: Hong Zhiguo <honkiko@gmail.com>