add restructuring, so after convert yast will have unified structure