update org serializer code to extend base BB classes and remove some field definitions in serializer
Bump BB version