Move to new struct