Configure options reorganization