BUG-611 : refactor serializers

Change-Id: I37fac0c7226ef47cda7c96cd5e3163193103d2ae
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>