Reorganise configuration