added PigeonStruct, serializers; some refactoring