Move to a named struct