Reorganise UI yamls