Reorganise headers