Refactored package names, converted serialized data