add some more packages and re arrange