Struct refacts - part 1