Move serialVersionUID to the class actually serialized