Reorganise configure