re arrange package and fixed import error