split structure and values - changes