#19 - removed system json serializer, serialization reorganisation