package re-arrangement