some class is in wrong package so have to move those class

Signed-off-by: dansam-shen <shenshaoqin_163@163.com>