Reorganizing Serialization related classes