[WIZ-219] refactoring for separate editing of XDS extension (in progress)