reorganise packages