organize some package