renaming
refactoring serializers
refactoring serialization part