config refactor part I