Moving from defines to structs