renamed package, started to implement serialization