Restructure relation between structs