Structs refactoring