reorganise configs