make some package reFactoring