reorganise headers