Refactored into folders and introduced serializers