Refactored class names
Refactored serializers